Mercurial > vim
annotate src/misc1.c @ 13772:cc21507ee4b1 v8.0.1758
patch 8.0.1758: open_line() returns TRUE/FALSE for success/failure
commit https://github.com/vim/vim/commit/24a2d7264fc2394f69a9a890b34d1f09cf63b14e
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 24 19:36:43 2018 +0200
patch 8.0.1758: open_line() returns TRUE/FALSE for success/failure
Problem: open_line() returns TRUE/FALSE for success/failure.
Solution: Return OK or FAIL.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 24 Apr 2018 19:45:07 +0200 |
| parents | bcef80912112 |
| children | d0d8125ba692 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
10002
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 /* | |
| 11 * misc1.c: functions that didn't seem to fit elsewhere | |
| 12 */ | |
| 13 | |
| 14 #include "vim.h" | |
| 15 #include "version.h" | |
| 16 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
17 static char_u *vim_version_dir(char_u *vimdir); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
18 static char_u *remove_tail(char_u *p, char_u *pend, char_u *name); |
|
4940
8bbd0ff486b3
updated for version 7.3.1215
Bram Moolenaar <bram@vim.org>
parents:
4938
diff
changeset
|
19 #if defined(FEAT_CMDL_COMPL) |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
20 static void init_users(void); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
21 #endif |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
22 static int copy_indent(int size, char_u *src); |
| 7 | 23 |
| 3744 | 24 /* All user names (for ~user completion as done by shell). */ |
| 25 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) | |
| 26 static garray_T ga_users; | |
| 27 #endif | |
| 28 | |
| 7 | 29 /* |
| 30 * Count the size (in window cells) of the indent in the current line. | |
| 31 */ | |
| 32 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
33 get_indent(void) |
| 7 | 34 { |
| 5995 | 35 return get_indent_str(ml_get_curline(), (int)curbuf->b_p_ts, FALSE); |
| 7 | 36 } |
| 37 | |
| 38 /* | |
| 39 * Count the size (in window cells) of the indent in line "lnum". | |
| 40 */ | |
| 41 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
42 get_indent_lnum(linenr_T lnum) |
| 7 | 43 { |
| 5995 | 44 return get_indent_str(ml_get(lnum), (int)curbuf->b_p_ts, FALSE); |
| 7 | 45 } |
| 46 | |
| 47 #if defined(FEAT_FOLDING) || defined(PROTO) | |
| 48 /* | |
| 49 * Count the size (in window cells) of the indent in line "lnum" of buffer | |
| 50 * "buf". | |
| 51 */ | |
| 52 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
53 get_indent_buf(buf_T *buf, linenr_T lnum) |
| 7 | 54 { |
| 5995 | 55 return get_indent_str(ml_get_buf(buf, lnum, FALSE), (int)buf->b_p_ts, FALSE); |
| 7 | 56 } |
| 57 #endif | |
| 58 | |
| 59 /* | |
| 60 * count the size (in window cells) of the indent in line "ptr", with | |
| 61 * 'tabstop' at "ts" | |
| 62 */ | |
| 164 | 63 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
64 get_indent_str( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
65 char_u *ptr, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
66 int ts, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
67 int list) /* if TRUE, count only screen size for tabs */ |
| 7 | 68 { |
| 69 int count = 0; | |
| 70 | |
| 71 for ( ; *ptr; ++ptr) | |
| 72 { | |
| 5995 | 73 if (*ptr == TAB) |
| 74 { | |
| 75 if (!list || lcs_tab1) /* count a tab for what it is worth */ | |
| 76 count += ts - (count % ts); | |
| 77 else | |
| 6174 | 78 /* In list mode, when tab is not set, count screen char width |
| 79 * for Tab, displays: ^I */ | |
| 5995 | 80 count += ptr2cells(ptr); |
| 81 } | |
| 7 | 82 else if (*ptr == ' ') |
| 83 ++count; /* count a space for one */ | |
| 84 else | |
| 85 break; | |
| 86 } | |
| 164 | 87 return count; |
| 7 | 88 } |
| 89 | |
| 90 /* | |
| 91 * Set the indent of the current line. | |
| 92 * Leaves the cursor on the first non-blank in the line. | |
| 93 * Caller must take care of undo. | |
| 94 * "flags": | |
| 95 * SIN_CHANGED: call changed_bytes() if the line was changed. | |
| 96 * SIN_INSERT: insert the indent in front of the line. | |
| 97 * SIN_UNDO: save line for undo before changing it. | |
| 98 * Returns TRUE if the line was changed. | |
| 99 */ | |
| 100 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
101 set_indent( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
102 int size, /* measured in spaces */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
103 int flags) |
| 7 | 104 { |
| 105 char_u *p; | |
| 106 char_u *newline; | |
| 107 char_u *oldline; | |
| 108 char_u *s; | |
| 109 int todo; | |
| 1324 | 110 int ind_len; /* measured in characters */ |
| 7 | 111 int line_len; |
| 112 int doit = FALSE; | |
| 1324 | 113 int ind_done = 0; /* measured in spaces */ |
| 7 | 114 int tab_pad; |
| 217 | 115 int retval = FALSE; |
| 1359 | 116 int orig_char_len = -1; /* number of initial whitespace chars when |
| 1324 | 117 'et' and 'pi' are both set */ |
| 7 | 118 |
| 119 /* | |
| 120 * First check if there is anything to do and compute the number of | |
| 121 * characters needed for the indent. | |
| 122 */ | |
| 123 todo = size; | |
| 124 ind_len = 0; | |
| 125 p = oldline = ml_get_curline(); | |
| 126 | |
| 127 /* Calculate the buffer size for the new indent, and check to see if it | |
| 128 * isn't already set */ | |
| 129 | |
| 1324 | 130 /* if 'expandtab' isn't set: use TABs; if both 'expandtab' and |
| 131 * 'preserveindent' are set count the number of characters at the | |
| 132 * beginning of the line to be copied */ | |
| 133 if (!curbuf->b_p_et || (!(flags & SIN_INSERT) && curbuf->b_p_pi)) | |
| 7 | 134 { |
| 135 /* If 'preserveindent' is set then reuse as much as possible of | |
| 136 * the existing indent structure for the new indent */ | |
| 137 if (!(flags & SIN_INSERT) && curbuf->b_p_pi) | |
| 138 { | |
| 139 ind_done = 0; | |
| 140 | |
| 141 /* count as many characters as we can use */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
142 while (todo > 0 && VIM_ISWHITE(*p)) |
| 7 | 143 { |
| 144 if (*p == TAB) | |
| 145 { | |
| 146 tab_pad = (int)curbuf->b_p_ts | |
| 147 - (ind_done % (int)curbuf->b_p_ts); | |
| 148 /* stop if this tab will overshoot the target */ | |
| 149 if (todo < tab_pad) | |
| 150 break; | |
| 151 todo -= tab_pad; | |
| 152 ++ind_len; | |
| 153 ind_done += tab_pad; | |
| 154 } | |
| 155 else | |
| 156 { | |
| 157 --todo; | |
| 158 ++ind_len; | |
| 159 ++ind_done; | |
| 160 } | |
| 161 ++p; | |
| 162 } | |
| 163 | |
| 1324 | 164 /* Set initial number of whitespace chars to copy if we are |
| 165 * preserving indent but expandtab is set */ | |
| 166 if (curbuf->b_p_et) | |
| 167 orig_char_len = ind_len; | |
| 168 | |
| 7 | 169 /* Fill to next tabstop with a tab, if possible */ |
| 170 tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts); | |
| 1359 | 171 if (todo >= tab_pad && orig_char_len == -1) |
| 7 | 172 { |
| 173 doit = TRUE; | |
| 174 todo -= tab_pad; | |
| 175 ++ind_len; | |
| 176 /* ind_done += tab_pad; */ | |
| 177 } | |
| 178 } | |
| 179 | |
| 180 /* count tabs required for indent */ | |
| 181 while (todo >= (int)curbuf->b_p_ts) | |
| 182 { | |
| 183 if (*p != TAB) | |
| 184 doit = TRUE; | |
| 185 else | |
| 186 ++p; | |
| 187 todo -= (int)curbuf->b_p_ts; | |
| 188 ++ind_len; | |
| 189 /* ind_done += (int)curbuf->b_p_ts; */ | |
| 190 } | |
| 191 } | |
| 192 /* count spaces required for indent */ | |
| 193 while (todo > 0) | |
| 194 { | |
| 195 if (*p != ' ') | |
| 196 doit = TRUE; | |
| 197 else | |
| 198 ++p; | |
| 199 --todo; | |
| 200 ++ind_len; | |
| 201 /* ++ind_done; */ | |
| 202 } | |
| 203 | |
| 204 /* Return if the indent is OK already. */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
205 if (!doit && !VIM_ISWHITE(*p) && !(flags & SIN_INSERT)) |
| 7 | 206 return FALSE; |
| 207 | |
| 208 /* Allocate memory for the new line. */ | |
| 209 if (flags & SIN_INSERT) | |
| 210 p = oldline; | |
| 211 else | |
| 212 p = skipwhite(p); | |
| 213 line_len = (int)STRLEN(p) + 1; | |
| 1324 | 214 |
| 215 /* If 'preserveindent' and 'expandtab' are both set keep the original | |
| 216 * characters and allocate accordingly. We will fill the rest with spaces | |
| 217 * after the if (!curbuf->b_p_et) below. */ | |
| 1359 | 218 if (orig_char_len != -1) |
| 1324 | 219 { |
| 220 newline = alloc(orig_char_len + size - ind_done + line_len); | |
| 221 if (newline == NULL) | |
| 222 return FALSE; | |
| 1359 | 223 todo = size - ind_done; |
| 224 ind_len = orig_char_len + todo; /* Set total length of indent in | |
| 225 * characters, which may have been | |
| 226 * undercounted until now */ | |
| 1324 | 227 p = oldline; |
| 228 s = newline; | |
| 229 while (orig_char_len > 0) | |
| 230 { | |
| 231 *s++ = *p++; | |
| 232 orig_char_len--; | |
| 233 } | |
| 1474 | 234 |
| 1324 | 235 /* Skip over any additional white space (useful when newindent is less |
| 236 * than old) */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
237 while (VIM_ISWHITE(*p)) |
| 1474 | 238 ++p; |
| 1348 | 239 |
| 1324 | 240 } |
| 241 else | |
| 242 { | |
| 243 todo = size; | |
| 244 newline = alloc(ind_len + line_len); | |
| 245 if (newline == NULL) | |
| 246 return FALSE; | |
| 247 s = newline; | |
| 248 } | |
| 7 | 249 |
| 250 /* Put the characters in the new line. */ | |
| 251 /* if 'expandtab' isn't set: use TABs */ | |
| 252 if (!curbuf->b_p_et) | |
| 253 { | |
| 254 /* If 'preserveindent' is set then reuse as much as possible of | |
| 255 * the existing indent structure for the new indent */ | |
| 256 if (!(flags & SIN_INSERT) && curbuf->b_p_pi) | |
| 257 { | |
| 258 p = oldline; | |
| 259 ind_done = 0; | |
| 260 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
261 while (todo > 0 && VIM_ISWHITE(*p)) |
| 7 | 262 { |
| 263 if (*p == TAB) | |
| 264 { | |
| 265 tab_pad = (int)curbuf->b_p_ts | |
| 266 - (ind_done % (int)curbuf->b_p_ts); | |
| 267 /* stop if this tab will overshoot the target */ | |
| 268 if (todo < tab_pad) | |
| 269 break; | |
| 270 todo -= tab_pad; | |
| 271 ind_done += tab_pad; | |
| 272 } | |
| 273 else | |
| 274 { | |
| 275 --todo; | |
| 276 ++ind_done; | |
| 277 } | |
| 278 *s++ = *p++; | |
| 279 } | |
| 280 | |
| 281 /* Fill to next tabstop with a tab, if possible */ | |
| 282 tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts); | |
| 283 if (todo >= tab_pad) | |
| 284 { | |
| 285 *s++ = TAB; | |
| 286 todo -= tab_pad; | |
| 287 } | |
| 288 | |
| 289 p = skipwhite(p); | |
| 290 } | |
| 291 | |
| 292 while (todo >= (int)curbuf->b_p_ts) | |
| 293 { | |
| 294 *s++ = TAB; | |
| 295 todo -= (int)curbuf->b_p_ts; | |
| 296 } | |
| 297 } | |
| 298 while (todo > 0) | |
| 299 { | |
| 300 *s++ = ' '; | |
| 301 --todo; | |
| 302 } | |
| 303 mch_memmove(s, p, (size_t)line_len); | |
| 304 | |
| 305 /* Replace the line (unless undo fails). */ | |
| 306 if (!(flags & SIN_UNDO) || u_savesub(curwin->w_cursor.lnum) == OK) | |
| 307 { | |
| 308 ml_replace(curwin->w_cursor.lnum, newline, FALSE); | |
| 309 if (flags & SIN_CHANGED) | |
| 310 changed_bytes(curwin->w_cursor.lnum, 0); | |
| 5403 | 311 /* Correct saved cursor position if it is in this line. */ |
| 312 if (saved_cursor.lnum == curwin->w_cursor.lnum) | |
| 313 { | |
| 314 if (saved_cursor.col >= (colnr_T)(p - oldline)) | |
| 315 /* cursor was after the indent, adjust for the number of | |
| 316 * bytes added/removed */ | |
| 317 saved_cursor.col += ind_len - (colnr_T)(p - oldline); | |
| 318 else if (saved_cursor.col >= (colnr_T)(s - newline)) | |
| 319 /* cursor was in the indent, and is now after it, put it back | |
| 320 * at the start of the indent (replacing spaces with TAB) */ | |
| 321 saved_cursor.col = (colnr_T)(s - newline); | |
| 322 } | |
| 217 | 323 retval = TRUE; |
| 7 | 324 } |
| 325 else | |
| 326 vim_free(newline); | |
| 327 | |
| 328 curwin->w_cursor.col = ind_len; | |
| 217 | 329 return retval; |
| 7 | 330 } |
| 331 | |
| 332 /* | |
| 333 * Copy the indent from ptr to the current line (and fill to size) | |
| 334 * Leaves the cursor on the first non-blank in the line. | |
| 335 * Returns TRUE if the line was changed. | |
| 336 */ | |
| 337 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
338 copy_indent(int size, char_u *src) |
| 7 | 339 { |
| 340 char_u *p = NULL; | |
| 341 char_u *line = NULL; | |
| 342 char_u *s; | |
| 343 int todo; | |
| 344 int ind_len; | |
| 345 int line_len = 0; | |
| 346 int tab_pad; | |
| 347 int ind_done; | |
| 348 int round; | |
| 349 | |
| 350 /* Round 1: compute the number of characters needed for the indent | |
| 351 * Round 2: copy the characters. */ | |
| 352 for (round = 1; round <= 2; ++round) | |
| 353 { | |
| 354 todo = size; | |
| 355 ind_len = 0; | |
| 356 ind_done = 0; | |
| 357 s = src; | |
| 358 | |
| 359 /* Count/copy the usable portion of the source line */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
360 while (todo > 0 && VIM_ISWHITE(*s)) |
| 7 | 361 { |
| 362 if (*s == TAB) | |
| 363 { | |
| 364 tab_pad = (int)curbuf->b_p_ts | |
| 365 - (ind_done % (int)curbuf->b_p_ts); | |
| 366 /* Stop if this tab will overshoot the target */ | |
| 367 if (todo < tab_pad) | |
| 368 break; | |
| 369 todo -= tab_pad; | |
| 370 ind_done += tab_pad; | |
| 371 } | |
| 372 else | |
| 373 { | |
| 374 --todo; | |
| 375 ++ind_done; | |
| 376 } | |
| 377 ++ind_len; | |
| 840 | 378 if (p != NULL) |
| 7 | 379 *p++ = *s; |
| 380 ++s; | |
| 381 } | |
| 382 | |
| 383 /* Fill to next tabstop with a tab, if possible */ | |
| 384 tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts); | |
| 3058 | 385 if (todo >= tab_pad && !curbuf->b_p_et) |
| 7 | 386 { |
| 387 todo -= tab_pad; | |
| 388 ++ind_len; | |
| 840 | 389 if (p != NULL) |
| 7 | 390 *p++ = TAB; |
| 391 } | |
| 392 | |
| 393 /* Add tabs required for indent */ | |
| 3058 | 394 while (todo >= (int)curbuf->b_p_ts && !curbuf->b_p_et) |
| 7 | 395 { |
| 396 todo -= (int)curbuf->b_p_ts; | |
| 397 ++ind_len; | |
| 840 | 398 if (p != NULL) |
| 7 | 399 *p++ = TAB; |
| 400 } | |
| 401 | |
| 402 /* Count/add spaces required for indent */ | |
| 403 while (todo > 0) | |
| 404 { | |
| 405 --todo; | |
| 406 ++ind_len; | |
| 840 | 407 if (p != NULL) |
| 7 | 408 *p++ = ' '; |
| 409 } | |
| 410 | |
| 840 | 411 if (p == NULL) |
| 7 | 412 { |
| 413 /* Allocate memory for the result: the copied indent, new indent | |
| 414 * and the rest of the line. */ | |
| 415 line_len = (int)STRLEN(ml_get_curline()) + 1; | |
| 416 line = alloc(ind_len + line_len); | |
| 417 if (line == NULL) | |
| 418 return FALSE; | |
| 419 p = line; | |
| 420 } | |
| 421 } | |
| 422 | |
| 423 /* Append the original line */ | |
| 424 mch_memmove(p, ml_get_curline(), (size_t)line_len); | |
| 425 | |
| 426 /* Replace the line */ | |
| 427 ml_replace(curwin->w_cursor.lnum, line, FALSE); | |
| 428 | |
| 429 /* Put the cursor after the indent. */ | |
| 430 curwin->w_cursor.col = ind_len; | |
| 431 return TRUE; | |
| 432 } | |
| 433 | |
| 434 /* | |
| 435 * Return the indent of the current line after a number. Return -1 if no | |
| 436 * number was found. Used for 'n' in 'formatoptions': numbered list. | |
| 41 | 437 * Since a pattern is used it can actually handle more than numbers. |
| 7 | 438 */ |
| 439 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
440 get_number_indent(linenr_T lnum) |
| 7 | 441 { |
| 442 colnr_T col; | |
| 443 pos_T pos; | |
| 444 | |
| 3632 | 445 regmatch_T regmatch; |
| 446 int lead_len = 0; /* length of comment leader */ | |
| 447 | |
| 7 | 448 if (lnum > curbuf->b_ml.ml_line_count) |
| 449 return -1; | |
| 41 | 450 pos.lnum = 0; |
| 3584 | 451 |
| 452 #ifdef FEAT_COMMENTS | |
| 3632 | 453 /* In format_lines() (i.e. not insert mode), fo+=q is needed too... */ |
| 454 if ((State & INSERT) || has_format_option(FO_Q_COMS)) | |
| 3584 | 455 lead_len = get_leader_len(ml_get(lnum), NULL, FALSE, TRUE); |
| 3632 | 456 #endif |
| 457 regmatch.regprog = vim_regcomp(curbuf->b_p_flp, RE_MAGIC); | |
| 458 if (regmatch.regprog != NULL) | |
| 459 { | |
| 460 regmatch.rm_ic = FALSE; | |
| 461 | |
| 462 /* vim_regexec() expects a pointer to a line. This lets us | |
| 463 * start matching for the flp beyond any comment leader... */ | |
| 464 if (vim_regexec(®match, ml_get(lnum) + lead_len, (colnr_T)0)) | |
| 465 { | |
| 466 pos.lnum = lnum; | |
| 467 pos.col = (colnr_T)(*regmatch.endp - ml_get(lnum)); | |
| 41 | 468 #ifdef FEAT_VIRTUALEDIT |
| 3632 | 469 pos.coladd = 0; |
| 470 #endif | |
| 471 } | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4752
diff
changeset
|
472 vim_regfree(regmatch.regprog); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4752
diff
changeset
|
473 } |
| 41 | 474 |
| 475 if (pos.lnum == 0 || *ml_get_pos(&pos) == NUL) | |
| 7 | 476 return -1; |
| 477 getvcol(curwin, &pos, &col, NULL, NULL); | |
| 478 return (int)col; | |
| 479 } | |
| 480 | |
| 5995 | 481 #if defined(FEAT_LINEBREAK) || defined(PROTO) |
| 482 /* | |
| 483 * Return appropriate space number for breakindent, taking influencing | |
| 484 * parameters into account. Window must be specified, since it is not | |
| 485 * necessarily always the current one. | |
| 486 */ | |
| 487 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
488 get_breakindent_win( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
489 win_T *wp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
490 char_u *line) /* start of the line */ |
| 5995 | 491 { |
| 492 static int prev_indent = 0; /* cached indent value */ | |
| 493 static long prev_ts = 0L; /* cached tabstop value */ | |
| 494 static char_u *prev_line = NULL; /* cached pointer to line */ | |
|
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10807
diff
changeset
|
495 static varnumber_T prev_tick = 0; /* changedtick of cached value */ |
| 5995 | 496 int bri = 0; |
| 497 /* window width minus window margin space, i.e. what rests for text */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
498 const int eff_wwidth = wp->w_width |
| 5995 | 499 - ((wp->w_p_nu || wp->w_p_rnu) |
| 500 && (vim_strchr(p_cpo, CPO_NUMCOL) == NULL) | |
| 501 ? number_width(wp) + 1 : 0); | |
| 502 | |
| 503 /* used cached indent, unless pointer or 'tabstop' changed */ | |
| 6010 | 504 if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10932
diff
changeset
|
505 || prev_tick != CHANGEDTICK(wp->w_buffer)) |
| 5995 | 506 { |
| 507 prev_line = line; | |
| 508 prev_ts = wp->w_buffer->b_p_ts; | |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10932
diff
changeset
|
509 prev_tick = CHANGEDTICK(wp->w_buffer); |
| 5995 | 510 prev_indent = get_indent_str(line, |
| 6012 | 511 (int)wp->w_buffer->b_p_ts, wp->w_p_list); |
| 512 } | |
| 513 bri = prev_indent + wp->w_p_brishift; | |
| 5995 | 514 |
| 515 /* indent minus the length of the showbreak string */ | |
| 516 if (wp->w_p_brisbr) | |
| 517 bri -= vim_strsize(p_sbr); | |
| 518 | |
| 519 /* Add offset for number column, if 'n' is in 'cpoptions' */ | |
| 520 bri += win_col_off2(wp); | |
| 521 | |
| 522 /* never indent past left window margin */ | |
| 523 if (bri < 0) | |
| 524 bri = 0; | |
| 525 /* always leave at least bri_min characters on the left, | |
| 526 * if text width is sufficient */ | |
| 527 else if (bri > eff_wwidth - wp->w_p_brimin) | |
| 528 bri = (eff_wwidth - wp->w_p_brimin < 0) | |
| 529 ? 0 : eff_wwidth - wp->w_p_brimin; | |
| 530 | |
| 531 return bri; | |
| 532 } | |
| 533 #endif | |
| 534 | |
| 535 | |
| 7 | 536 #if defined(FEAT_CINDENT) || defined(FEAT_SMARTINDENT) |
| 537 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
538 static int cin_is_cinword(char_u *line); |
| 7 | 539 |
| 540 /* | |
| 541 * Return TRUE if the string "line" starts with a word from 'cinwords'. | |
| 542 */ | |
| 543 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
544 cin_is_cinword(char_u *line) |
| 7 | 545 { |
| 546 char_u *cinw; | |
| 547 char_u *cinw_buf; | |
| 548 int cinw_len; | |
| 549 int retval = FALSE; | |
| 550 int len; | |
| 551 | |
| 552 cinw_len = (int)STRLEN(curbuf->b_p_cinw) + 1; | |
| 553 cinw_buf = alloc((unsigned)cinw_len); | |
| 554 if (cinw_buf != NULL) | |
| 555 { | |
| 556 line = skipwhite(line); | |
| 557 for (cinw = curbuf->b_p_cinw; *cinw; ) | |
| 558 { | |
| 559 len = copy_option_part(&cinw, cinw_buf, cinw_len, ","); | |
| 560 if (STRNCMP(line, cinw_buf, len) == 0 | |
| 561 && (!vim_iswordc(line[len]) || !vim_iswordc(line[len - 1]))) | |
| 562 { | |
| 563 retval = TRUE; | |
| 564 break; | |
| 565 } | |
| 566 } | |
| 567 vim_free(cinw_buf); | |
| 568 } | |
| 569 return retval; | |
| 570 } | |
| 571 #endif | |
| 572 | |
| 573 /* | |
| 574 * open_line: Add a new line below or above the current line. | |
| 575 * | |
| 576 * For VREPLACE mode, we only add a new line when we get to the end of the | |
| 577 * file, otherwise we just start replacing the next line. | |
| 578 * | |
| 579 * Caller must take care of undo. Since VREPLACE may affect any number of | |
| 580 * lines however, it may call u_save_cursor() again when starting to change a | |
| 581 * new line. | |
| 582 * "flags": OPENLINE_DELSPACES delete spaces after cursor | |
| 583 * OPENLINE_DO_COM format comments | |
| 584 * OPENLINE_KEEPTRAIL keep trailing spaces | |
| 585 * OPENLINE_MARKFIX adjust mark positions after the line break | |
| 3584 | 586 * OPENLINE_COM_LIST format comments with list or 2nd line indent |
| 587 * | |
| 588 * "second_line_indent": indent for after ^^D in Insert mode or if flag | |
| 589 * OPENLINE_COM_LIST | |
| 7 | 590 * |
|
13772
cc21507ee4b1
patch 8.0.1758: open_line() returns TRUE/FALSE for success/failure
Christian Brabandt <cb@256bit.org>
parents:
13768
diff
changeset
|
591 * Return OK for success, FAIL for failure |
| 7 | 592 */ |
| 593 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
594 open_line( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
595 int dir, /* FORWARD or BACKWARD */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
596 int flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
597 int second_line_indent) |
| 7 | 598 { |
| 599 char_u *saved_line; /* copy of the original line */ | |
| 600 char_u *next_line = NULL; /* copy of the next line */ | |
| 601 char_u *p_extra = NULL; /* what goes to next line */ | |
| 602 int less_cols = 0; /* less columns for mark in new line */ | |
| 603 int less_cols_off = 0; /* columns to skip for mark adjust */ | |
| 604 pos_T old_cursor; /* old cursor position */ | |
| 605 int newcol = 0; /* new cursor column */ | |
| 606 int newindent = 0; /* auto-indent of the new line */ | |
| 607 int n; | |
| 608 int trunc_line = FALSE; /* truncate current line afterwards */ | |
|
13772
cc21507ee4b1
patch 8.0.1758: open_line() returns TRUE/FALSE for success/failure
Christian Brabandt <cb@256bit.org>
parents:
13768
diff
changeset
|
609 int retval = FAIL; /* return value */ |
| 7 | 610 #ifdef FEAT_COMMENTS |
| 611 int extra_len = 0; /* length of p_extra string */ | |
| 612 int lead_len; /* length of comment leader */ | |
| 613 char_u *lead_flags; /* position in 'comments' for comment leader */ | |
| 614 char_u *leader = NULL; /* copy of comment leader */ | |
| 615 #endif | |
| 616 char_u *allocated = NULL; /* allocated memory */ | |
| 617 #if defined(FEAT_SMARTINDENT) || defined(FEAT_VREPLACE) || defined(FEAT_LISP) \ | |
| 618 || defined(FEAT_CINDENT) || defined(FEAT_COMMENTS) | |
| 619 char_u *p; | |
| 620 #endif | |
| 621 int saved_char = NUL; /* init for GCC */ | |
| 622 #if defined(FEAT_SMARTINDENT) || defined(FEAT_COMMENTS) | |
| 623 pos_T *pos; | |
| 624 #endif | |
| 625 #ifdef FEAT_SMARTINDENT | |
| 626 int do_si = (!p_paste && curbuf->b_p_si | |
| 627 # ifdef FEAT_CINDENT | |
| 628 && !curbuf->b_p_cin | |
| 629 # endif | |
|
11943
268b1036cd17
patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is set
Christian Brabandt <cb@256bit.org>
parents:
11678
diff
changeset
|
630 # ifdef FEAT_EVAL |
|
268b1036cd17
patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is set
Christian Brabandt <cb@256bit.org>
parents:
11678
diff
changeset
|
631 && *curbuf->b_p_inde == NUL |
|
268b1036cd17
patch 8.0.0851: 'smartindent' is used even when 'indentexpr' is set
Christian Brabandt <cb@256bit.org>
parents:
11678
diff
changeset
|
632 # endif |
| 7 | 633 ); |
| 634 int no_si = FALSE; /* reset did_si afterwards */ | |
| 635 int first_char = NUL; /* init for GCC */ | |
| 636 #endif | |
| 637 #if defined(FEAT_VREPLACE) && (defined(FEAT_LISP) || defined(FEAT_CINDENT)) | |
| 638 int vreplace_mode; | |
| 639 #endif | |
| 640 int did_append; /* appended a new line */ | |
| 641 int saved_pi = curbuf->b_p_pi; /* copy of preserveindent setting */ | |
| 642 | |
| 643 /* | |
| 644 * make a copy of the current line so we can mess with it | |
| 645 */ | |
| 646 saved_line = vim_strsave(ml_get_curline()); | |
| 647 if (saved_line == NULL) /* out of memory! */ | |
| 648 return FALSE; | |
| 649 | |
| 650 #ifdef FEAT_VREPLACE | |
| 651 if (State & VREPLACE_FLAG) | |
| 652 { | |
| 653 /* | |
| 654 * With VREPLACE we make a copy of the next line, which we will be | |
| 655 * starting to replace. First make the new line empty and let vim play | |
| 656 * with the indenting and comment leader to its heart's content. Then | |
| 657 * we grab what it ended up putting on the new line, put back the | |
| 658 * original line, and call ins_char() to put each new character onto | |
| 659 * the line, replacing what was there before and pushing the right | |
| 660 * stuff onto the replace stack. -- webb. | |
| 661 */ | |
| 662 if (curwin->w_cursor.lnum < orig_line_count) | |
| 663 next_line = vim_strsave(ml_get(curwin->w_cursor.lnum + 1)); | |
| 664 else | |
| 665 next_line = vim_strsave((char_u *)""); | |
| 666 if (next_line == NULL) /* out of memory! */ | |
| 667 goto theend; | |
| 668 | |
| 669 /* | |
| 670 * In VREPLACE mode, a NL replaces the rest of the line, and starts | |
| 671 * replacing the next line, so push all of the characters left on the | |
| 672 * line onto the replace stack. We'll push any other characters that | |
| 673 * might be replaced at the start of the next line (due to autoindent | |
| 674 * etc) a bit later. | |
| 675 */ | |
| 676 replace_push(NUL); /* Call twice because BS over NL expects it */ | |
| 677 replace_push(NUL); | |
| 678 p = saved_line + curwin->w_cursor.col; | |
| 679 while (*p != NUL) | |
| 1470 | 680 { |
| 681 #ifdef FEAT_MBYTE | |
| 682 if (has_mbyte) | |
| 683 p += replace_push_mb(p); | |
| 684 else | |
| 685 #endif | |
| 686 replace_push(*p++); | |
| 687 } | |
| 7 | 688 saved_line[curwin->w_cursor.col] = NUL; |
| 689 } | |
| 690 #endif | |
| 691 | |
| 692 if ((State & INSERT) | |
| 693 #ifdef FEAT_VREPLACE | |
| 694 && !(State & VREPLACE_FLAG) | |
| 695 #endif | |
| 696 ) | |
| 697 { | |
| 698 p_extra = saved_line + curwin->w_cursor.col; | |
| 699 #ifdef FEAT_SMARTINDENT | |
| 700 if (do_si) /* need first char after new line break */ | |
| 701 { | |
| 702 p = skipwhite(p_extra); | |
| 703 first_char = *p; | |
| 704 } | |
| 705 #endif | |
| 706 #ifdef FEAT_COMMENTS | |
| 707 extra_len = (int)STRLEN(p_extra); | |
| 708 #endif | |
| 709 saved_char = *p_extra; | |
| 710 *p_extra = NUL; | |
| 711 } | |
| 712 | |
| 713 u_clearline(); /* cannot do "U" command when adding lines */ | |
| 714 #ifdef FEAT_SMARTINDENT | |
| 715 did_si = FALSE; | |
| 716 #endif | |
| 717 ai_col = 0; | |
| 718 | |
| 719 /* | |
| 720 * If we just did an auto-indent, then we didn't type anything on | |
| 721 * the prior line, and it should be truncated. Do this even if 'ai' is not | |
| 722 * set because automatically inserting a comment leader also sets did_ai. | |
| 723 */ | |
| 724 if (dir == FORWARD && did_ai) | |
| 725 trunc_line = TRUE; | |
| 726 | |
| 727 /* | |
| 728 * If 'autoindent' and/or 'smartindent' is set, try to figure out what | |
| 729 * indent to use for the new line. | |
| 730 */ | |
| 731 if (curbuf->b_p_ai | |
| 732 #ifdef FEAT_SMARTINDENT | |
| 733 || do_si | |
| 734 #endif | |
| 735 ) | |
| 736 { | |
| 737 /* | |
| 738 * count white space on current line | |
| 739 */ | |
| 5995 | 740 newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts, FALSE); |
| 3584 | 741 if (newindent == 0 && !(flags & OPENLINE_COM_LIST)) |
| 742 newindent = second_line_indent; /* for ^^D command in insert mode */ | |
| 7 | 743 |
| 744 #ifdef FEAT_SMARTINDENT | |
| 745 /* | |
| 746 * Do smart indenting. | |
| 747 * In insert/replace mode (only when dir == FORWARD) | |
| 748 * we may move some text to the next line. If it starts with '{' | |
| 749 * don't add an indent. Fixes inserting a NL before '{' in line | |
| 750 * "if (condition) {" | |
| 751 */ | |
| 752 if (!trunc_line && do_si && *saved_line != NUL | |
| 753 && (p_extra == NULL || first_char != '{')) | |
| 754 { | |
| 755 char_u *ptr; | |
| 756 char_u last_char; | |
| 757 | |
| 758 old_cursor = curwin->w_cursor; | |
| 759 ptr = saved_line; | |
| 760 # ifdef FEAT_COMMENTS | |
| 761 if (flags & OPENLINE_DO_COM) | |
| 3562 | 762 lead_len = get_leader_len(ptr, NULL, FALSE, TRUE); |
| 7 | 763 else |
| 764 lead_len = 0; | |
| 765 # endif | |
| 766 if (dir == FORWARD) | |
| 767 { | |
| 768 /* | |
| 769 * Skip preprocessor directives, unless they are | |
| 770 * recognised as comments. | |
| 771 */ | |
| 772 if ( | |
| 773 # ifdef FEAT_COMMENTS | |
| 774 lead_len == 0 && | |
| 775 # endif | |
| 776 ptr[0] == '#') | |
| 777 { | |
| 778 while (ptr[0] == '#' && curwin->w_cursor.lnum > 1) | |
| 779 ptr = ml_get(--curwin->w_cursor.lnum); | |
| 780 newindent = get_indent(); | |
| 781 } | |
| 782 # ifdef FEAT_COMMENTS | |
| 783 if (flags & OPENLINE_DO_COM) | |
| 3562 | 784 lead_len = get_leader_len(ptr, NULL, FALSE, TRUE); |
| 7 | 785 else |
| 786 lead_len = 0; | |
| 787 if (lead_len > 0) | |
| 788 { | |
| 789 /* | |
| 790 * This case gets the following right: | |
| 791 * \* | |
| 792 * * A comment (read '\' as '/'). | |
| 793 * *\ | |
| 794 * #define IN_THE_WAY | |
| 795 * This should line up here; | |
| 796 */ | |
| 797 p = skipwhite(ptr); | |
| 798 if (p[0] == '/' && p[1] == '*') | |
| 799 p++; | |
| 800 if (p[0] == '*') | |
| 801 { | |
| 802 for (p++; *p; p++) | |
| 803 { | |
| 804 if (p[0] == '/' && p[-1] == '*') | |
| 805 { | |
| 806 /* | |
| 807 * End of C comment, indent should line up | |
| 808 * with the line containing the start of | |
| 809 * the comment | |
| 810 */ | |
| 811 curwin->w_cursor.col = (colnr_T)(p - ptr); | |
| 812 if ((pos = findmatch(NULL, NUL)) != NULL) | |
| 813 { | |
| 814 curwin->w_cursor.lnum = pos->lnum; | |
| 815 newindent = get_indent(); | |
| 816 } | |
| 817 } | |
| 818 } | |
| 819 } | |
| 820 } | |
| 821 else /* Not a comment line */ | |
| 822 # endif | |
| 823 { | |
| 824 /* Find last non-blank in line */ | |
| 825 p = ptr + STRLEN(ptr) - 1; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
826 while (p > ptr && VIM_ISWHITE(*p)) |
| 7 | 827 --p; |
| 828 last_char = *p; | |
| 829 | |
| 830 /* | |
| 831 * find the character just before the '{' or ';' | |
| 832 */ | |
| 833 if (last_char == '{' || last_char == ';') | |
| 834 { | |
| 835 if (p > ptr) | |
| 836 --p; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
837 while (p > ptr && VIM_ISWHITE(*p)) |
| 7 | 838 --p; |
| 839 } | |
| 840 /* | |
| 841 * Try to catch lines that are split over multiple | |
| 842 * lines. eg: | |
| 843 * if (condition && | |
| 844 * condition) { | |
| 845 * Should line up here! | |
| 846 * } | |
| 847 */ | |
| 848 if (*p == ')') | |
| 849 { | |
| 850 curwin->w_cursor.col = (colnr_T)(p - ptr); | |
| 851 if ((pos = findmatch(NULL, '(')) != NULL) | |
| 852 { | |
| 853 curwin->w_cursor.lnum = pos->lnum; | |
| 854 newindent = get_indent(); | |
| 855 ptr = ml_get_curline(); | |
| 856 } | |
| 857 } | |
| 858 /* | |
| 859 * If last character is '{' do indent, without | |
| 860 * checking for "if" and the like. | |
| 861 */ | |
| 862 if (last_char == '{') | |
| 863 { | |
| 864 did_si = TRUE; /* do indent */ | |
| 865 no_si = TRUE; /* don't delete it when '{' typed */ | |
| 866 } | |
| 867 /* | |
| 868 * Look for "if" and the like, use 'cinwords'. | |
| 869 * Don't do this if the previous line ended in ';' or | |
| 870 * '}'. | |
| 871 */ | |
| 872 else if (last_char != ';' && last_char != '}' | |
| 873 && cin_is_cinword(ptr)) | |
| 874 did_si = TRUE; | |
| 875 } | |
| 876 } | |
| 877 else /* dir == BACKWARD */ | |
| 878 { | |
| 879 /* | |
| 880 * Skip preprocessor directives, unless they are | |
| 881 * recognised as comments. | |
| 882 */ | |
| 883 if ( | |
| 884 # ifdef FEAT_COMMENTS | |
| 885 lead_len == 0 && | |
| 886 # endif | |
| 887 ptr[0] == '#') | |
| 888 { | |
| 889 int was_backslashed = FALSE; | |
| 890 | |
| 891 while ((ptr[0] == '#' || was_backslashed) && | |
| 892 curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
| 893 { | |
| 894 if (*ptr && ptr[STRLEN(ptr) - 1] == '\\') | |
| 895 was_backslashed = TRUE; | |
| 896 else | |
| 897 was_backslashed = FALSE; | |
| 898 ptr = ml_get(++curwin->w_cursor.lnum); | |
| 899 } | |
| 900 if (was_backslashed) | |
| 901 newindent = 0; /* Got to end of file */ | |
| 902 else | |
| 903 newindent = get_indent(); | |
| 904 } | |
| 905 p = skipwhite(ptr); | |
| 906 if (*p == '}') /* if line starts with '}': do indent */ | |
| 907 did_si = TRUE; | |
| 908 else /* can delete indent when '{' typed */ | |
| 909 can_si_back = TRUE; | |
| 910 } | |
| 911 curwin->w_cursor = old_cursor; | |
| 912 } | |
| 913 if (do_si) | |
| 914 can_si = TRUE; | |
| 915 #endif /* FEAT_SMARTINDENT */ | |
| 916 | |
| 917 did_ai = TRUE; | |
| 918 } | |
| 919 | |
| 920 #ifdef FEAT_COMMENTS | |
| 921 /* | |
| 922 * Find out if the current line starts with a comment leader. | |
| 923 * This may then be inserted in front of the new line. | |
| 924 */ | |
| 925 end_comment_pending = NUL; | |
| 926 if (flags & OPENLINE_DO_COM) | |
| 3562 | 927 lead_len = get_leader_len(saved_line, &lead_flags, dir == BACKWARD, TRUE); |
| 7 | 928 else |
| 929 lead_len = 0; | |
| 930 if (lead_len > 0) | |
| 931 { | |
| 932 char_u *lead_repl = NULL; /* replaces comment leader */ | |
| 933 int lead_repl_len = 0; /* length of *lead_repl */ | |
| 934 char_u lead_middle[COM_MAX_LEN]; /* middle-comment string */ | |
| 935 char_u lead_end[COM_MAX_LEN]; /* end-comment string */ | |
| 936 char_u *comment_end = NULL; /* where lead_end has been found */ | |
| 937 int extra_space = FALSE; /* append extra space */ | |
| 938 int current_flag; | |
| 939 int require_blank = FALSE; /* requires blank after middle */ | |
| 940 char_u *p2; | |
| 941 | |
| 942 /* | |
| 943 * If the comment leader has the start, middle or end flag, it may not | |
| 944 * be used or may be replaced with the middle leader. | |
| 945 */ | |
| 946 for (p = lead_flags; *p && *p != ':'; ++p) | |
| 947 { | |
| 948 if (*p == COM_BLANK) | |
| 949 { | |
| 950 require_blank = TRUE; | |
| 951 continue; | |
| 952 } | |
| 953 if (*p == COM_START || *p == COM_MIDDLE) | |
| 954 { | |
| 955 current_flag = *p; | |
| 956 if (*p == COM_START) | |
| 957 { | |
| 958 /* | |
| 959 * Doing "O" on a start of comment does not insert leader. | |
| 960 */ | |
| 961 if (dir == BACKWARD) | |
| 962 { | |
| 963 lead_len = 0; | |
| 964 break; | |
| 965 } | |
| 966 | |
| 967 /* find start of middle part */ | |
| 968 (void)copy_option_part(&p, lead_middle, COM_MAX_LEN, ","); | |
| 969 require_blank = FALSE; | |
| 970 } | |
| 971 | |
| 972 /* | |
| 973 * Isolate the strings of the middle and end leader. | |
| 974 */ | |
| 975 while (*p && p[-1] != ':') /* find end of middle flags */ | |
| 976 { | |
| 977 if (*p == COM_BLANK) | |
| 978 require_blank = TRUE; | |
| 979 ++p; | |
| 980 } | |
| 981 (void)copy_option_part(&p, lead_middle, COM_MAX_LEN, ","); | |
| 982 | |
| 983 while (*p && p[-1] != ':') /* find end of end flags */ | |
| 984 { | |
| 985 /* Check whether we allow automatic ending of comments */ | |
| 986 if (*p == COM_AUTO_END) | |
| 987 end_comment_pending = -1; /* means we want to set it */ | |
| 988 ++p; | |
| 989 } | |
| 990 n = copy_option_part(&p, lead_end, COM_MAX_LEN, ","); | |
| 991 | |
| 992 if (end_comment_pending == -1) /* we can set it now */ | |
| 993 end_comment_pending = lead_end[n - 1]; | |
| 994 | |
| 995 /* | |
| 996 * If the end of the comment is in the same line, don't use | |
| 997 * the comment leader. | |
| 998 */ | |
| 999 if (dir == FORWARD) | |
| 1000 { | |
| 1001 for (p = saved_line + lead_len; *p; ++p) | |
| 1002 if (STRNCMP(p, lead_end, n) == 0) | |
| 1003 { | |
| 1004 comment_end = p; | |
| 1005 lead_len = 0; | |
| 1006 break; | |
| 1007 } | |
| 1008 } | |
| 1009 | |
| 1010 /* | |
| 1011 * Doing "o" on a start of comment inserts the middle leader. | |
| 1012 */ | |
| 1013 if (lead_len > 0) | |
| 1014 { | |
| 1015 if (current_flag == COM_START) | |
| 1016 { | |
| 1017 lead_repl = lead_middle; | |
| 1018 lead_repl_len = (int)STRLEN(lead_middle); | |
| 1019 } | |
| 1020 | |
| 1021 /* | |
| 1022 * If we have hit RETURN immediately after the start | |
| 1023 * comment leader, then put a space after the middle | |
| 1024 * comment leader on the next line. | |
| 1025 */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1026 if (!VIM_ISWHITE(saved_line[lead_len - 1]) |
| 7 | 1027 && ((p_extra != NULL |
| 1028 && (int)curwin->w_cursor.col == lead_len) | |
| 1029 || (p_extra == NULL | |
| 1030 && saved_line[lead_len] == NUL) | |
| 1031 || require_blank)) | |
| 1032 extra_space = TRUE; | |
| 1033 } | |
| 1034 break; | |
| 1035 } | |
| 1036 if (*p == COM_END) | |
| 1037 { | |
| 1038 /* | |
| 1039 * Doing "o" on the end of a comment does not insert leader. | |
| 1040 * Remember where the end is, might want to use it to find the | |
| 1041 * start (for C-comments). | |
| 1042 */ | |
| 1043 if (dir == FORWARD) | |
| 1044 { | |
| 1045 comment_end = skipwhite(saved_line); | |
| 1046 lead_len = 0; | |
| 1047 break; | |
| 1048 } | |
| 1049 | |
| 1050 /* | |
| 1051 * Doing "O" on the end of a comment inserts the middle leader. | |
| 1052 * Find the string for the middle leader, searching backwards. | |
| 1053 */ | |
| 1054 while (p > curbuf->b_p_com && *p != ',') | |
| 1055 --p; | |
| 1056 for (lead_repl = p; lead_repl > curbuf->b_p_com | |
| 1057 && lead_repl[-1] != ':'; --lead_repl) | |
| 1058 ; | |
| 1059 lead_repl_len = (int)(p - lead_repl); | |
| 1060 | |
| 1061 /* We can probably always add an extra space when doing "O" on | |
| 1062 * the comment-end */ | |
| 1063 extra_space = TRUE; | |
| 1064 | |
| 1065 /* Check whether we allow automatic ending of comments */ | |
| 1066 for (p2 = p; *p2 && *p2 != ':'; p2++) | |
| 1067 { | |
| 1068 if (*p2 == COM_AUTO_END) | |
| 1069 end_comment_pending = -1; /* means we want to set it */ | |
| 1070 } | |
| 1071 if (end_comment_pending == -1) | |
| 1072 { | |
| 1073 /* Find last character in end-comment string */ | |
| 1074 while (*p2 && *p2 != ',') | |
| 1075 p2++; | |
| 1076 end_comment_pending = p2[-1]; | |
| 1077 } | |
| 1078 break; | |
| 1079 } | |
| 1080 if (*p == COM_FIRST) | |
| 1081 { | |
| 1082 /* | |
| 1083 * Comment leader for first line only: Don't repeat leader | |
| 1084 * when using "O", blank out leader when using "o". | |
| 1085 */ | |
| 1086 if (dir == BACKWARD) | |
| 1087 lead_len = 0; | |
| 1088 else | |
| 1089 { | |
| 1090 lead_repl = (char_u *)""; | |
| 1091 lead_repl_len = 0; | |
| 1092 } | |
| 1093 break; | |
| 1094 } | |
| 1095 } | |
| 1096 if (lead_len) | |
| 1097 { | |
| 3596 | 1098 /* allocate buffer (may concatenate p_extra later) */ |
| 3584 | 1099 leader = alloc(lead_len + lead_repl_len + extra_space + extra_len |
| 3596 | 1100 + (second_line_indent > 0 ? second_line_indent : 0) + 1); |
| 7 | 1101 allocated = leader; /* remember to free it later */ |
| 1102 | |
| 1103 if (leader == NULL) | |
| 1104 lead_len = 0; | |
| 1105 else | |
| 1106 { | |
| 419 | 1107 vim_strncpy(leader, saved_line, lead_len); |
| 7 | 1108 |
| 1109 /* | |
| 1110 * Replace leader with lead_repl, right or left adjusted | |
| 1111 */ | |
| 1112 if (lead_repl != NULL) | |
| 1113 { | |
| 1114 int c = 0; | |
| 1115 int off = 0; | |
| 1116 | |
| 1996 | 1117 for (p = lead_flags; *p != NUL && *p != ':'; ) |
| 7 | 1118 { |
| 1119 if (*p == COM_RIGHT || *p == COM_LEFT) | |
| 1996 | 1120 c = *p++; |
| 7 | 1121 else if (VIM_ISDIGIT(*p) || *p == '-') |
| 1122 off = getdigits(&p); | |
| 1996 | 1123 else |
| 1124 ++p; | |
| 7 | 1125 } |
| 1126 if (c == COM_RIGHT) /* right adjusted leader */ | |
| 1127 { | |
| 1128 /* find last non-white in the leader to line up with */ | |
| 1129 for (p = leader + lead_len - 1; p > leader | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1130 && VIM_ISWHITE(*p); --p) |
| 7 | 1131 ; |
| 1132 ++p; | |
| 17 | 1133 |
| 1134 #ifdef FEAT_MBYTE | |
| 1135 /* Compute the length of the replaced characters in | |
| 1136 * screen characters, not bytes. */ | |
| 1137 { | |
| 1138 int repl_size = vim_strnsize(lead_repl, | |
| 1139 lead_repl_len); | |
| 1140 int old_size = 0; | |
| 1141 char_u *endp = p; | |
| 1142 int l; | |
| 1143 | |
| 1144 while (old_size < repl_size && p > leader) | |
| 1145 { | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
1146 MB_PTR_BACK(leader, p); |
| 17 | 1147 old_size += ptr2cells(p); |
| 1148 } | |
| 835 | 1149 l = lead_repl_len - (int)(endp - p); |
| 17 | 1150 if (l != 0) |
| 1151 mch_memmove(endp + l, endp, | |
| 1152 (size_t)((leader + lead_len) - endp)); | |
| 1153 lead_len += l; | |
| 1154 } | |
| 1155 #else | |
| 7 | 1156 if (p < leader + lead_repl_len) |
| 1157 p = leader; | |
| 1158 else | |
| 1159 p -= lead_repl_len; | |
| 17 | 1160 #endif |
| 7 | 1161 mch_memmove(p, lead_repl, (size_t)lead_repl_len); |
| 1162 if (p + lead_repl_len > leader + lead_len) | |
| 1163 p[lead_repl_len] = NUL; | |
| 1164 | |
| 1165 /* blank-out any other chars from the old leader. */ | |
| 1166 while (--p >= leader) | |
| 17 | 1167 { |
| 1168 #ifdef FEAT_MBYTE | |
| 1169 int l = mb_head_off(leader, p); | |
| 1170 | |
| 1171 if (l > 1) | |
| 1172 { | |
| 1173 p -= l; | |
| 1174 if (ptr2cells(p) > 1) | |
| 1175 { | |
| 1176 p[1] = ' '; | |
| 1177 --l; | |
| 1178 } | |
| 1179 mch_memmove(p + 1, p + l + 1, | |
| 1180 (size_t)((leader + lead_len) - (p + l + 1))); | |
| 1181 lead_len -= l; | |
| 1182 *p = ' '; | |
| 1183 } | |
| 1184 else | |
| 1185 #endif | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1186 if (!VIM_ISWHITE(*p)) |
| 7 | 1187 *p = ' '; |
| 17 | 1188 } |
| 7 | 1189 } |
| 1190 else /* left adjusted leader */ | |
| 1191 { | |
| 1192 p = skipwhite(leader); | |
| 17 | 1193 #ifdef FEAT_MBYTE |
| 1194 /* Compute the length of the replaced characters in | |
| 1195 * screen characters, not bytes. Move the part that is | |
| 1196 * not to be overwritten. */ | |
| 1197 { | |
| 1198 int repl_size = vim_strnsize(lead_repl, | |
| 1199 lead_repl_len); | |
| 1200 int i; | |
| 1201 int l; | |
| 1202 | |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8724
diff
changeset
|
1203 for (i = 0; i < lead_len && p[i] != NUL; i += l) |
| 17 | 1204 { |
| 474 | 1205 l = (*mb_ptr2len)(p + i); |
| 17 | 1206 if (vim_strnsize(p, i + l) > repl_size) |
| 1207 break; | |
| 1208 } | |
| 1209 if (i != lead_repl_len) | |
| 1210 { | |
| 1211 mch_memmove(p + lead_repl_len, p + i, | |
| 2002 | 1212 (size_t)(lead_len - i - (p - leader))); |
| 17 | 1213 lead_len += lead_repl_len - i; |
| 1214 } | |
| 1215 } | |
| 1216 #endif | |
| 7 | 1217 mch_memmove(p, lead_repl, (size_t)lead_repl_len); |
| 1218 | |
| 1219 /* Replace any remaining non-white chars in the old | |
| 1220 * leader by spaces. Keep Tabs, the indent must | |
| 1221 * remain the same. */ | |
| 1222 for (p += lead_repl_len; p < leader + lead_len; ++p) | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1223 if (!VIM_ISWHITE(*p)) |
| 7 | 1224 { |
| 1225 /* Don't put a space before a TAB. */ | |
| 1226 if (p + 1 < leader + lead_len && p[1] == TAB) | |
| 1227 { | |
| 1228 --lead_len; | |
| 1229 mch_memmove(p, p + 1, | |
| 1230 (leader + lead_len) - p); | |
| 1231 } | |
| 1232 else | |
| 17 | 1233 { |
| 1234 #ifdef FEAT_MBYTE | |
| 474 | 1235 int l = (*mb_ptr2len)(p); |
| 17 | 1236 |
| 1237 if (l > 1) | |
| 1238 { | |
| 1239 if (ptr2cells(p) > 1) | |
| 1240 { | |
| 1241 /* Replace a double-wide char with | |
| 1242 * two spaces */ | |
| 1243 --l; | |
| 1244 *p++ = ' '; | |
| 1245 } | |
| 1246 mch_memmove(p + 1, p + l, | |
| 1247 (leader + lead_len) - p); | |
| 1248 lead_len -= l - 1; | |
| 1249 } | |
| 1250 #endif | |
| 7 | 1251 *p = ' '; |
| 17 | 1252 } |
| 7 | 1253 } |
| 1254 *p = NUL; | |
| 1255 } | |
| 1256 | |
| 1257 /* Recompute the indent, it may have changed. */ | |
| 1258 if (curbuf->b_p_ai | |
| 1259 #ifdef FEAT_SMARTINDENT | |
| 1260 || do_si | |
| 1261 #endif | |
| 1262 ) | |
| 5995 | 1263 newindent = get_indent_str(leader, (int)curbuf->b_p_ts, FALSE); |
| 7 | 1264 |
| 1265 /* Add the indent offset */ | |
| 1266 if (newindent + off < 0) | |
| 1267 { | |
| 1268 off = -newindent; | |
| 1269 newindent = 0; | |
| 1270 } | |
| 1271 else | |
| 1272 newindent += off; | |
| 1273 | |
| 1274 /* Correct trailing spaces for the shift, so that | |
| 1275 * alignment remains equal. */ | |
| 1276 while (off > 0 && lead_len > 0 | |
| 1277 && leader[lead_len - 1] == ' ') | |
| 1278 { | |
| 1279 /* Don't do it when there is a tab before the space */ | |
| 1280 if (vim_strchr(skipwhite(leader), '\t') != NULL) | |
| 1281 break; | |
| 1282 --lead_len; | |
| 1283 --off; | |
| 1284 } | |
| 1285 | |
| 1286 /* If the leader ends in white space, don't add an | |
| 1287 * extra space */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1288 if (lead_len > 0 && VIM_ISWHITE(leader[lead_len - 1])) |
| 7 | 1289 extra_space = FALSE; |
| 1290 leader[lead_len] = NUL; | |
| 1291 } | |
| 1292 | |
| 1293 if (extra_space) | |
| 1294 { | |
| 1295 leader[lead_len++] = ' '; | |
| 1296 leader[lead_len] = NUL; | |
| 1297 } | |
| 1298 | |
| 1299 newcol = lead_len; | |
| 1300 | |
| 1301 /* | |
| 1302 * if a new indent will be set below, remove the indent that | |
| 1303 * is in the comment leader | |
| 1304 */ | |
| 1305 if (newindent | |
| 1306 #ifdef FEAT_SMARTINDENT | |
| 1307 || did_si | |
| 1308 #endif | |
| 1309 ) | |
| 1310 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1311 while (lead_len && VIM_ISWHITE(*leader)) |
| 7 | 1312 { |
| 1313 --lead_len; | |
| 1314 --newcol; | |
| 1315 ++leader; | |
| 1316 } | |
| 1317 } | |
| 1318 | |
| 1319 } | |
| 1320 #ifdef FEAT_SMARTINDENT | |
| 1321 did_si = can_si = FALSE; | |
| 1322 #endif | |
| 1323 } | |
| 1324 else if (comment_end != NULL) | |
| 1325 { | |
| 1326 /* | |
| 1327 * We have finished a comment, so we don't use the leader. | |
| 1328 * If this was a C-comment and 'ai' or 'si' is set do a normal | |
| 1329 * indent to align with the line containing the start of the | |
| 1330 * comment. | |
| 1331 */ | |
| 1332 if (comment_end[0] == '*' && comment_end[1] == '/' && | |
| 1333 (curbuf->b_p_ai | |
| 1334 #ifdef FEAT_SMARTINDENT | |
| 1335 || do_si | |
| 1336 #endif | |
| 1337 )) | |
| 1338 { | |
| 1339 old_cursor = curwin->w_cursor; | |
| 1340 curwin->w_cursor.col = (colnr_T)(comment_end - saved_line); | |
| 1341 if ((pos = findmatch(NULL, NUL)) != NULL) | |
| 1342 { | |
| 1343 curwin->w_cursor.lnum = pos->lnum; | |
| 1344 newindent = get_indent(); | |
| 1345 } | |
| 1346 curwin->w_cursor = old_cursor; | |
| 1347 } | |
| 1348 } | |
| 1349 } | |
| 1350 #endif | |
| 1351 | |
| 1352 /* (State == INSERT || State == REPLACE), only when dir == FORWARD */ | |
| 1353 if (p_extra != NULL) | |
| 1354 { | |
| 1355 *p_extra = saved_char; /* restore char that NUL replaced */ | |
| 1356 | |
| 1357 /* | |
| 1358 * When 'ai' set or "flags" has OPENLINE_DELSPACES, skip to the first | |
| 1359 * non-blank. | |
| 1360 * | |
| 1361 * When in REPLACE mode, put the deleted blanks on the replace stack, | |
| 1362 * preceded by a NUL, so they can be put back when a BS is entered. | |
| 1363 */ | |
| 1364 if (REPLACE_NORMAL(State)) | |
| 1365 replace_push(NUL); /* end of extra blanks */ | |
| 1366 if (curbuf->b_p_ai || (flags & OPENLINE_DELSPACES)) | |
| 1367 { | |
| 1368 while ((*p_extra == ' ' || *p_extra == '\t') | |
| 1369 #ifdef FEAT_MBYTE | |
| 1370 && (!enc_utf8 | |
| 1371 || !utf_iscomposing(utf_ptr2char(p_extra + 1))) | |
| 1372 #endif | |
| 1373 ) | |
| 1374 { | |
| 1375 if (REPLACE_NORMAL(State)) | |
| 1376 replace_push(*p_extra); | |
| 1377 ++p_extra; | |
| 1378 ++less_cols_off; | |
| 1379 } | |
| 1380 } | |
| 1381 if (*p_extra != NUL) | |
| 1382 did_ai = FALSE; /* append some text, don't truncate now */ | |
| 1383 | |
| 1384 /* columns for marks adjusted for removed columns */ | |
| 1385 less_cols = (int)(p_extra - saved_line); | |
| 1386 } | |
| 1387 | |
| 1388 if (p_extra == NULL) | |
| 1389 p_extra = (char_u *)""; /* append empty line */ | |
| 1390 | |
| 1391 #ifdef FEAT_COMMENTS | |
| 1392 /* concatenate leader and p_extra, if there is a leader */ | |
| 1393 if (lead_len) | |
| 1394 { | |
| 3584 | 1395 if (flags & OPENLINE_COM_LIST && second_line_indent > 0) |
| 1396 { | |
| 1397 int i; | |
| 3592 | 1398 int padding = second_line_indent |
| 1399 - (newindent + (int)STRLEN(leader)); | |
| 3584 | 1400 |
| 1401 /* Here whitespace is inserted after the comment char. | |
| 1402 * Below, set_indent(newindent, SIN_INSERT) will insert the | |
| 1403 * whitespace needed before the comment char. */ | |
| 1404 for (i = 0; i < padding; i++) | |
| 1405 { | |
| 1406 STRCAT(leader, " "); | |
| 3705 | 1407 less_cols--; |
| 3584 | 1408 newcol++; |
| 1409 } | |
| 1410 } | |
| 7 | 1411 STRCAT(leader, p_extra); |
| 1412 p_extra = leader; | |
| 1413 did_ai = TRUE; /* So truncating blanks works with comments */ | |
| 1414 less_cols -= lead_len; | |
| 1415 } | |
| 1416 else | |
| 1417 end_comment_pending = NUL; /* turns out there was no leader */ | |
| 1418 #endif | |
| 1419 | |
| 1420 old_cursor = curwin->w_cursor; | |
| 1421 if (dir == BACKWARD) | |
| 1422 --curwin->w_cursor.lnum; | |
| 1423 #ifdef FEAT_VREPLACE | |
| 1424 if (!(State & VREPLACE_FLAG) || old_cursor.lnum >= orig_line_count) | |
| 1425 #endif | |
| 1426 { | |
| 1427 if (ml_append(curwin->w_cursor.lnum, p_extra, (colnr_T)0, FALSE) | |
| 1428 == FAIL) | |
| 1429 goto theend; | |
| 1430 /* Postpone calling changed_lines(), because it would mess up folding | |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
1431 * with markers. |
|
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
1432 * Skip mark_adjust when adding a line after the last one, there can't |
|
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1433 * be marks there. But still needed in diff mode. */ |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1434 if (curwin->w_cursor.lnum + 1 < curbuf->b_ml.ml_line_count |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1435 #ifdef FEAT_DIFF |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1436 || curwin->w_p_diff |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1437 #endif |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1438 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
1439 mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L); |
| 7 | 1440 did_append = TRUE; |
| 1441 } | |
| 1442 #ifdef FEAT_VREPLACE | |
| 1443 else | |
| 1444 { | |
| 1445 /* | |
| 1446 * In VREPLACE mode we are starting to replace the next line. | |
| 1447 */ | |
| 1448 curwin->w_cursor.lnum++; | |
| 1449 if (curwin->w_cursor.lnum >= Insstart.lnum + vr_lines_changed) | |
| 1450 { | |
| 1451 /* In case we NL to a new line, BS to the previous one, and NL | |
| 1452 * again, we don't want to save the new line for undo twice. | |
| 1453 */ | |
| 1454 (void)u_save_cursor(); /* errors are ignored! */ | |
| 1455 vr_lines_changed++; | |
| 1456 } | |
| 1457 ml_replace(curwin->w_cursor.lnum, p_extra, TRUE); | |
| 1458 changed_bytes(curwin->w_cursor.lnum, 0); | |
| 1459 curwin->w_cursor.lnum--; | |
| 1460 did_append = FALSE; | |
| 1461 } | |
| 1462 #endif | |
| 1463 | |
| 1464 if (newindent | |
| 1465 #ifdef FEAT_SMARTINDENT | |
| 1466 || did_si | |
| 1467 #endif | |
| 1468 ) | |
| 1469 { | |
| 1470 ++curwin->w_cursor.lnum; | |
| 1471 #ifdef FEAT_SMARTINDENT | |
| 1472 if (did_si) | |
| 1473 { | |
| 5867 | 1474 int sw = (int)get_sw_value(curbuf); |
| 3740 | 1475 |
| 7 | 1476 if (p_sr) |
| 3740 | 1477 newindent -= newindent % sw; |
| 1478 newindent += sw; | |
| 7 | 1479 } |
| 1480 #endif | |
| 1324 | 1481 /* Copy the indent */ |
| 1482 if (curbuf->b_p_ci) | |
| 7 | 1483 { |
| 1484 (void)copy_indent(newindent, saved_line); | |
| 1485 | |
| 1486 /* | |
| 1487 * Set the 'preserveindent' option so that any further screwing | |
| 1488 * with the line doesn't entirely destroy our efforts to preserve | |
| 1489 * it. It gets restored at the function end. | |
| 1490 */ | |
| 1491 curbuf->b_p_pi = TRUE; | |
| 1492 } | |
| 1493 else | |
| 1494 (void)set_indent(newindent, SIN_INSERT); | |
| 1495 less_cols -= curwin->w_cursor.col; | |
| 1496 | |
| 1497 ai_col = curwin->w_cursor.col; | |
| 1498 | |
| 1499 /* | |
| 1500 * In REPLACE mode, for each character in the new indent, there must | |
| 1501 * be a NUL on the replace stack, for when it is deleted with BS | |
| 1502 */ | |
| 1503 if (REPLACE_NORMAL(State)) | |
| 1504 for (n = 0; n < (int)curwin->w_cursor.col; ++n) | |
| 1505 replace_push(NUL); | |
| 1506 newcol += curwin->w_cursor.col; | |
| 1507 #ifdef FEAT_SMARTINDENT | |
| 1508 if (no_si) | |
| 1509 did_si = FALSE; | |
| 1510 #endif | |
| 1511 } | |
| 1512 | |
| 1513 #ifdef FEAT_COMMENTS | |
| 1514 /* | |
| 1515 * In REPLACE mode, for each character in the extra leader, there must be | |
| 1516 * a NUL on the replace stack, for when it is deleted with BS. | |
| 1517 */ | |
| 1518 if (REPLACE_NORMAL(State)) | |
| 1519 while (lead_len-- > 0) | |
| 1520 replace_push(NUL); | |
| 1521 #endif | |
| 1522 | |
| 1523 curwin->w_cursor = old_cursor; | |
| 1524 | |
| 1525 if (dir == FORWARD) | |
| 1526 { | |
| 1527 if (trunc_line || (State & INSERT)) | |
| 1528 { | |
| 1529 /* truncate current line at cursor */ | |
| 1530 saved_line[curwin->w_cursor.col] = NUL; | |
| 1531 /* Remove trailing white space, unless OPENLINE_KEEPTRAIL used. */ | |
| 1532 if (trunc_line && !(flags & OPENLINE_KEEPTRAIL)) | |
| 1533 truncate_spaces(saved_line); | |
| 1534 ml_replace(curwin->w_cursor.lnum, saved_line, FALSE); | |
| 1535 saved_line = NULL; | |
| 1536 if (did_append) | |
| 1537 { | |
| 1538 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
| 1539 curwin->w_cursor.lnum + 1, 1L); | |
| 1540 did_append = FALSE; | |
| 1541 | |
| 1542 /* Move marks after the line break to the new line. */ | |
| 1543 if (flags & OPENLINE_MARKFIX) | |
| 1544 mark_col_adjust(curwin->w_cursor.lnum, | |
| 1545 curwin->w_cursor.col + less_cols_off, | |
| 1546 1L, (long)-less_cols); | |
| 1547 } | |
| 1548 else | |
| 1549 changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); | |
| 1550 } | |
| 1551 | |
| 1552 /* | |
| 1553 * Put the cursor on the new line. Careful: the scrollup() above may | |
| 1554 * have moved w_cursor, we must use old_cursor. | |
| 1555 */ | |
| 1556 curwin->w_cursor.lnum = old_cursor.lnum + 1; | |
| 1557 } | |
| 1558 if (did_append) | |
| 1559 changed_lines(curwin->w_cursor.lnum, 0, curwin->w_cursor.lnum, 1L); | |
| 1560 | |
| 1561 curwin->w_cursor.col = newcol; | |
| 1562 #ifdef FEAT_VIRTUALEDIT | |
| 1563 curwin->w_cursor.coladd = 0; | |
| 1564 #endif | |
| 1565 | |
| 1566 #if defined(FEAT_VREPLACE) && (defined(FEAT_LISP) || defined(FEAT_CINDENT)) | |
| 1567 /* | |
| 1568 * In VREPLACE mode, we are handling the replace stack ourselves, so stop | |
| 1569 * fixthisline() from doing it (via change_indent()) by telling it we're in | |
| 1570 * normal INSERT mode. | |
| 1571 */ | |
| 1572 if (State & VREPLACE_FLAG) | |
| 1573 { | |
| 1574 vreplace_mode = State; /* So we know to put things right later */ | |
| 1575 State = INSERT; | |
| 1576 } | |
| 1577 else | |
| 1578 vreplace_mode = 0; | |
| 1579 #endif | |
| 1580 #ifdef FEAT_LISP | |
| 1581 /* | |
| 1582 * May do lisp indenting. | |
| 1583 */ | |
| 1584 if (!p_paste | |
| 1585 # ifdef FEAT_COMMENTS | |
| 1586 && leader == NULL | |
| 1587 # endif | |
| 1588 && curbuf->b_p_lisp | |
| 1589 && curbuf->b_p_ai) | |
| 1590 { | |
| 1591 fixthisline(get_lisp_indent); | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
1592 ai_col = (colnr_T)getwhitecols_curline(); |
| 7 | 1593 } |
| 1594 #endif | |
| 1595 #ifdef FEAT_CINDENT | |
| 1596 /* | |
| 1597 * May do indenting after opening a new line. | |
| 1598 */ | |
| 1599 if (!p_paste | |
| 1600 && (curbuf->b_p_cin | |
| 1601 # ifdef FEAT_EVAL | |
| 1602 || *curbuf->b_p_inde != NUL | |
| 1603 # endif | |
| 1604 ) | |
| 1605 && in_cinkeys(dir == FORWARD | |
| 1606 ? KEY_OPEN_FORW | |
| 1607 : KEY_OPEN_BACK, ' ', linewhite(curwin->w_cursor.lnum))) | |
| 1608 { | |
| 1609 do_c_expr_indent(); | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
1610 ai_col = (colnr_T)getwhitecols_curline(); |
| 7 | 1611 } |
| 1612 #endif | |
| 1613 #if defined(FEAT_VREPLACE) && (defined(FEAT_LISP) || defined(FEAT_CINDENT)) | |
| 1614 if (vreplace_mode != 0) | |
| 1615 State = vreplace_mode; | |
| 1616 #endif | |
| 1617 | |
| 1618 #ifdef FEAT_VREPLACE | |
| 1619 /* | |
| 1620 * Finally, VREPLACE gets the stuff on the new line, then puts back the | |
| 1621 * original line, and inserts the new stuff char by char, pushing old stuff | |
| 1622 * onto the replace stack (via ins_char()). | |
| 1623 */ | |
| 1624 if (State & VREPLACE_FLAG) | |
| 1625 { | |
| 1626 /* Put new line in p_extra */ | |
| 1627 p_extra = vim_strsave(ml_get_curline()); | |
| 1628 if (p_extra == NULL) | |
| 1629 goto theend; | |
| 1630 | |
| 1631 /* Put back original line */ | |
| 1632 ml_replace(curwin->w_cursor.lnum, next_line, FALSE); | |
| 1633 | |
| 1634 /* Insert new stuff into line again */ | |
| 1635 curwin->w_cursor.col = 0; | |
| 1636 #ifdef FEAT_VIRTUALEDIT | |
| 1637 curwin->w_cursor.coladd = 0; | |
| 1638 #endif | |
| 1639 ins_bytes(p_extra); /* will call changed_bytes() */ | |
| 1640 vim_free(p_extra); | |
| 1641 next_line = NULL; | |
| 1642 } | |
| 1643 #endif | |
| 1644 | |
|
13772
cc21507ee4b1
patch 8.0.1758: open_line() returns TRUE/FALSE for success/failure
Christian Brabandt <cb@256bit.org>
parents:
13768
diff
changeset
|
1645 retval = OK; /* success! */ |
| 7 | 1646 theend: |
| 1647 curbuf->b_p_pi = saved_pi; | |
| 1648 vim_free(saved_line); | |
| 1649 vim_free(next_line); | |
| 1650 vim_free(allocated); | |
| 1651 return retval; | |
| 1652 } | |
| 1653 | |
| 1654 #if defined(FEAT_COMMENTS) || defined(PROTO) | |
| 1655 /* | |
| 5403 | 1656 * get_leader_len() returns the length in bytes of the prefix of the given |
| 1657 * string which introduces a comment. If this string is not a comment then | |
| 1658 * 0 is returned. | |
| 7 | 1659 * When "flags" is not NULL, it is set to point to the flags of the recognized |
| 1660 * comment leader. | |
| 1661 * "backward" must be true for the "O" command. | |
| 3562 | 1662 * If "include_space" is set, include trailing whitespace while calculating the |
| 1663 * length. | |
| 7 | 1664 */ |
| 1665 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1666 get_leader_len( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1667 char_u *line, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1668 char_u **flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1669 int backward, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1670 int include_space) |
| 7 | 1671 { |
| 1672 int i, j; | |
| 3562 | 1673 int result; |
| 7 | 1674 int got_com = FALSE; |
| 1675 int found_one; | |
| 1676 char_u part_buf[COM_MAX_LEN]; /* buffer for one option part */ | |
| 1677 char_u *string; /* pointer to comment string */ | |
| 1678 char_u *list; | |
| 2809 | 1679 int middle_match_len = 0; |
| 1680 char_u *prev_list; | |
| 2813 | 1681 char_u *saved_flags = NULL; |
| 7 | 1682 |
| 3562 | 1683 result = i = 0; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1684 while (VIM_ISWHITE(line[i])) /* leading white space is ignored */ |
| 7 | 1685 ++i; |
| 1686 | |
| 1687 /* | |
| 1688 * Repeat to match several nested comment strings. | |
| 1689 */ | |
| 2809 | 1690 while (line[i] != NUL) |
| 7 | 1691 { |
| 1692 /* | |
| 1693 * scan through the 'comments' option for a match | |
| 1694 */ | |
| 1695 found_one = FALSE; | |
| 1696 for (list = curbuf->b_p_com; *list; ) | |
| 1697 { | |
| 2809 | 1698 /* Get one option part into part_buf[]. Advance "list" to next |
| 1699 * one. Put "string" at start of string. */ | |
| 1700 if (!got_com && flags != NULL) | |
| 1701 *flags = list; /* remember where flags started */ | |
| 1702 prev_list = list; | |
| 7 | 1703 (void)copy_option_part(&list, part_buf, COM_MAX_LEN, ","); |
| 1704 string = vim_strchr(part_buf, ':'); | |
| 1705 if (string == NULL) /* missing ':', ignore this part */ | |
| 1706 continue; | |
| 1707 *string++ = NUL; /* isolate flags from string */ | |
| 1708 | |
| 2809 | 1709 /* If we found a middle match previously, use that match when this |
| 1710 * is not a middle or end. */ | |
| 1711 if (middle_match_len != 0 | |
| 1712 && vim_strchr(part_buf, COM_MIDDLE) == NULL | |
| 1713 && vim_strchr(part_buf, COM_END) == NULL) | |
| 1714 break; | |
| 1715 | |
| 1716 /* When we already found a nested comment, only accept further | |
| 1717 * nested comments. */ | |
| 7 | 1718 if (got_com && vim_strchr(part_buf, COM_NEST) == NULL) |
| 1719 continue; | |
| 1720 | |
| 2809 | 1721 /* When 'O' flag present and using "O" command skip this one. */ |
| 7 | 1722 if (backward && vim_strchr(part_buf, COM_NOBACK) != NULL) |
| 1723 continue; | |
| 1724 | |
| 2809 | 1725 /* Line contents and string must match. |
| 7 | 1726 * When string starts with white space, must have some white space |
| 1727 * (but the amount does not need to match, there might be a mix of | |
| 2809 | 1728 * TABs and spaces). */ |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1729 if (VIM_ISWHITE(string[0])) |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1730 { |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1731 if (i == 0 || !VIM_ISWHITE(line[i - 1])) |
| 4352 | 1732 continue; /* missing white space */ |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1733 while (VIM_ISWHITE(string[0])) |
| 7 | 1734 ++string; |
| 1735 } | |
| 1736 for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j) | |
| 1737 ; | |
| 1738 if (string[j] != NUL) | |
| 2809 | 1739 continue; /* string doesn't match */ |
| 1740 | |
| 1741 /* When 'b' flag used, there must be white space or an | |
| 1742 * end-of-line after the string in the line. */ | |
| 7 | 1743 if (vim_strchr(part_buf, COM_BLANK) != NULL |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1744 && !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL) |
| 7 | 1745 continue; |
| 1746 | |
| 2809 | 1747 /* We have found a match, stop searching unless this is a middle |
| 1748 * comment. The middle comment can be a substring of the end | |
| 1749 * comment in which case it's better to return the length of the | |
| 1750 * end comment and its flags. Thus we keep searching with middle | |
| 1751 * and end matches and use an end match if it matches better. */ | |
| 1752 if (vim_strchr(part_buf, COM_MIDDLE) != NULL) | |
| 1753 { | |
| 1754 if (middle_match_len == 0) | |
| 1755 { | |
| 1756 middle_match_len = j; | |
| 1757 saved_flags = prev_list; | |
| 1758 } | |
| 1759 continue; | |
| 1760 } | |
| 1761 if (middle_match_len != 0 && j > middle_match_len) | |
| 1762 /* Use this match instead of the middle match, since it's a | |
| 1763 * longer thus better match. */ | |
| 1764 middle_match_len = 0; | |
| 1765 | |
| 1766 if (middle_match_len == 0) | |
| 1767 i += j; | |
| 7 | 1768 found_one = TRUE; |
| 1769 break; | |
| 1770 } | |
| 1771 | |
| 2809 | 1772 if (middle_match_len != 0) |
| 1773 { | |
| 1774 /* Use the previously found middle match after failing to find a | |
| 1775 * match with an end. */ | |
| 1776 if (!got_com && flags != NULL) | |
| 1777 *flags = saved_flags; | |
| 1778 i += middle_match_len; | |
| 1779 found_one = TRUE; | |
| 1780 } | |
| 1781 | |
| 1782 /* No match found, stop scanning. */ | |
| 7 | 1783 if (!found_one) |
| 1784 break; | |
| 1785 | |
| 3562 | 1786 result = i; |
| 1787 | |
| 2809 | 1788 /* Include any trailing white space. */ |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1789 while (VIM_ISWHITE(line[i])) |
| 7 | 1790 ++i; |
| 1791 | |
| 3562 | 1792 if (include_space) |
| 1793 result = i; | |
| 1794 | |
| 2809 | 1795 /* If this comment doesn't nest, stop here. */ |
| 1796 got_com = TRUE; | |
| 7 | 1797 if (vim_strchr(part_buf, COM_NEST) == NULL) |
| 1798 break; | |
| 1799 } | |
| 3562 | 1800 return result; |
| 1801 } | |
| 1802 | |
| 1803 /* | |
| 1804 * Return the offset at which the last comment in line starts. If there is no | |
| 1805 * comment in the whole line, -1 is returned. | |
| 1806 * | |
| 1807 * When "flags" is not null, it is set to point to the flags describing the | |
| 1808 * recognized comment leader. | |
| 1809 */ | |
| 1810 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1811 get_last_leader_offset(char_u *line, char_u **flags) |
| 3562 | 1812 { |
| 1813 int result = -1; | |
| 1814 int i, j; | |
| 1815 int lower_check_bound = 0; | |
| 1816 char_u *string; | |
| 1817 char_u *com_leader; | |
| 1818 char_u *com_flags; | |
| 1819 char_u *list; | |
| 1820 int found_one; | |
| 1821 char_u part_buf[COM_MAX_LEN]; /* buffer for one option part */ | |
| 1822 | |
| 1823 /* | |
| 1824 * Repeat to match several nested comment strings. | |
| 1825 */ | |
| 1826 i = (int)STRLEN(line); | |
| 1827 while (--i >= lower_check_bound) | |
| 1828 { | |
| 1829 /* | |
| 1830 * scan through the 'comments' option for a match | |
| 1831 */ | |
| 1832 found_one = FALSE; | |
| 1833 for (list = curbuf->b_p_com; *list; ) | |
| 1834 { | |
| 1835 char_u *flags_save = list; | |
| 1836 | |
| 1837 /* | |
| 1838 * Get one option part into part_buf[]. Advance list to next one. | |
| 1839 * put string at start of string. | |
| 1840 */ | |
| 1841 (void)copy_option_part(&list, part_buf, COM_MAX_LEN, ","); | |
| 1842 string = vim_strchr(part_buf, ':'); | |
| 1843 if (string == NULL) /* If everything is fine, this cannot actually | |
| 1844 * happen. */ | |
| 1845 { | |
| 1846 continue; | |
| 1847 } | |
| 1848 *string++ = NUL; /* Isolate flags from string. */ | |
| 1849 com_leader = string; | |
| 1850 | |
| 1851 /* | |
| 1852 * Line contents and string must match. | |
| 1853 * When string starts with white space, must have some white space | |
| 1854 * (but the amount does not need to match, there might be a mix of | |
| 1855 * TABs and spaces). | |
| 1856 */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1857 if (VIM_ISWHITE(string[0])) |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1858 { |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1859 if (i == 0 || !VIM_ISWHITE(line[i - 1])) |
| 3562 | 1860 continue; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1861 while (VIM_ISWHITE(string[0])) |
| 3562 | 1862 ++string; |
| 1863 } | |
| 1864 for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j) | |
| 1865 /* do nothing */; | |
| 1866 if (string[j] != NUL) | |
| 1867 continue; | |
| 1868 | |
| 1869 /* | |
| 1870 * When 'b' flag used, there must be white space or an | |
| 1871 * end-of-line after the string in the line. | |
| 1872 */ | |
| 1873 if (vim_strchr(part_buf, COM_BLANK) != NULL | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1874 && !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL) |
| 3562 | 1875 { |
| 1876 continue; | |
| 1877 } | |
| 1878 | |
| 1879 /* | |
| 1880 * We have found a match, stop searching. | |
| 1881 */ | |
| 1882 found_one = TRUE; | |
| 1883 | |
| 1884 if (flags) | |
| 1885 *flags = flags_save; | |
| 1886 com_flags = flags_save; | |
| 1887 | |
| 1888 break; | |
| 1889 } | |
| 1890 | |
| 1891 if (found_one) | |
| 1892 { | |
| 1893 char_u part_buf2[COM_MAX_LEN]; /* buffer for one option part */ | |
| 1894 int len1, len2, off; | |
| 1895 | |
| 1896 result = i; | |
| 1897 /* | |
| 1898 * If this comment nests, continue searching. | |
| 1899 */ | |
| 1900 if (vim_strchr(part_buf, COM_NEST) != NULL) | |
| 1901 continue; | |
| 1902 | |
| 1903 lower_check_bound = i; | |
| 1904 | |
| 1905 /* Let's verify whether the comment leader found is a substring | |
| 1906 * of other comment leaders. If it is, let's adjust the | |
| 1907 * lower_check_bound so that we make sure that we have determined | |
| 1908 * the comment leader correctly. | |
| 1909 */ | |
| 1910 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1911 while (VIM_ISWHITE(*com_leader)) |
| 3562 | 1912 ++com_leader; |
| 1913 len1 = (int)STRLEN(com_leader); | |
| 1914 | |
| 1915 for (list = curbuf->b_p_com; *list; ) | |
| 1916 { | |
| 1917 char_u *flags_save = list; | |
| 1918 | |
| 1919 (void)copy_option_part(&list, part_buf2, COM_MAX_LEN, ","); | |
| 1920 if (flags_save == com_flags) | |
| 1921 continue; | |
| 1922 string = vim_strchr(part_buf2, ':'); | |
| 1923 ++string; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1924 while (VIM_ISWHITE(*string)) |
| 3562 | 1925 ++string; |
| 1926 len2 = (int)STRLEN(string); | |
| 1927 if (len2 == 0) | |
| 1928 continue; | |
| 1929 | |
| 1930 /* Now we have to verify whether string ends with a substring | |
| 1931 * beginning the com_leader. */ | |
| 1932 for (off = (len2 > i ? i : len2); off > 0 && off + len1 > len2;) | |
| 1933 { | |
| 1934 --off; | |
| 1935 if (!STRNCMP(string + off, com_leader, len2 - off)) | |
| 1936 { | |
| 1937 if (i - off < lower_check_bound) | |
| 1938 lower_check_bound = i - off; | |
| 1939 } | |
| 1940 } | |
| 1941 } | |
| 1942 } | |
| 1943 } | |
| 1944 return result; | |
| 7 | 1945 } |
| 1946 #endif | |
| 1947 | |
| 1948 /* | |
| 1949 * Return the number of window lines occupied by buffer line "lnum". | |
| 1950 */ | |
| 1951 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1952 plines(linenr_T lnum) |
| 7 | 1953 { |
| 1954 return plines_win(curwin, lnum, TRUE); | |
| 1955 } | |
| 1956 | |
| 1957 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1958 plines_win( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1959 win_T *wp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1960 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1961 int winheight) /* when TRUE limit to window height */ |
| 7 | 1962 { |
| 1963 #if defined(FEAT_DIFF) || defined(PROTO) | |
| 1964 /* Check for filler lines above this buffer line. When folded the result | |
| 1965 * is one line anyway. */ | |
| 1966 return plines_win_nofill(wp, lnum, winheight) + diff_check_fill(wp, lnum); | |
| 1967 } | |
| 1968 | |
| 1969 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1970 plines_nofill(linenr_T lnum) |
| 7 | 1971 { |
| 1972 return plines_win_nofill(curwin, lnum, TRUE); | |
| 1973 } | |
| 1974 | |
| 1975 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1976 plines_win_nofill( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1977 win_T *wp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1978 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1979 int winheight) /* when TRUE limit to window height */ |
| 7 | 1980 { |
| 1981 #endif | |
| 1982 int lines; | |
| 1983 | |
| 1984 if (!wp->w_p_wrap) | |
| 1985 return 1; | |
| 1986 | |
| 1987 if (wp->w_width == 0) | |
| 1988 return 1; | |
| 1989 | |
| 1990 #ifdef FEAT_FOLDING | |
| 1991 /* A folded lines is handled just like an empty line. */ | |
| 1992 /* NOTE: Caller must handle lines that are MAYBE folded. */ | |
| 1993 if (lineFolded(wp, lnum) == TRUE) | |
| 1994 return 1; | |
| 1995 #endif | |
| 1996 | |
| 1997 lines = plines_win_nofold(wp, lnum); | |
| 1998 if (winheight > 0 && lines > wp->w_height) | |
| 1999 return (int)wp->w_height; | |
| 2000 return lines; | |
| 2001 } | |
| 2002 | |
| 2003 /* | |
| 2004 * Return number of window lines physical line "lnum" will occupy in window | |
| 2005 * "wp". Does not care about folding, 'wrap' or 'diff'. | |
| 2006 */ | |
| 2007 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2008 plines_win_nofold(win_T *wp, linenr_T lnum) |
| 7 | 2009 { |
| 2010 char_u *s; | |
| 2011 long col; | |
| 2012 int width; | |
| 2013 | |
| 2014 s = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 2015 if (*s == NUL) /* empty line */ | |
| 2016 return 1; | |
| 2017 col = win_linetabsize(wp, s, (colnr_T)MAXCOL); | |
| 2018 | |
| 2019 /* | |
| 2020 * If list mode is on, then the '$' at the end of the line may take up one | |
| 2021 * extra column. | |
| 2022 */ | |
| 2023 if (wp->w_p_list && lcs_eol != NUL) | |
| 2024 col += 1; | |
| 2025 | |
| 2026 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2162
diff
changeset
|
2027 * Add column offset for 'number', 'relativenumber' and 'foldcolumn'. |
| 7 | 2028 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2029 width = wp->w_width - win_col_off(wp); |
| 7 | 2030 if (width <= 0) |
| 2031 return 32000; | |
| 2032 if (col <= width) | |
| 2033 return 1; | |
| 2034 col -= width; | |
| 2035 width += win_col_off2(wp); | |
| 2036 return (col + (width - 1)) / width + 1; | |
| 2037 } | |
| 2038 | |
| 2039 /* | |
| 2040 * Like plines_win(), but only reports the number of physical screen lines | |
| 2041 * used from the start of the line to the given column number. | |
| 2042 */ | |
| 2043 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2044 plines_win_col(win_T *wp, linenr_T lnum, long column) |
| 7 | 2045 { |
| 2046 long col; | |
| 2047 char_u *s; | |
| 2048 int lines = 0; | |
| 2049 int width; | |
| 5995 | 2050 char_u *line; |
| 7 | 2051 |
| 2052 #ifdef FEAT_DIFF | |
| 2053 /* Check for filler lines above this buffer line. When folded the result | |
| 2054 * is one line anyway. */ | |
| 2055 lines = diff_check_fill(wp, lnum); | |
| 2056 #endif | |
| 2057 | |
| 2058 if (!wp->w_p_wrap) | |
| 2059 return lines + 1; | |
| 2060 | |
| 2061 if (wp->w_width == 0) | |
| 2062 return lines + 1; | |
| 2063 | |
| 5995 | 2064 line = s = ml_get_buf(wp->w_buffer, lnum, FALSE); |
| 7 | 2065 |
| 2066 col = 0; | |
| 2067 while (*s != NUL && --column >= 0) | |
| 2068 { | |
| 5995 | 2069 col += win_lbr_chartabsize(wp, line, s, (colnr_T)col, NULL); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2070 MB_PTR_ADV(s); |
| 7 | 2071 } |
| 2072 | |
| 2073 /* | |
| 2074 * If *s is a TAB, and the TAB is not displayed as ^I, and we're not in | |
| 2075 * INSERT mode, then col must be adjusted so that it represents the last | |
| 2076 * screen position of the TAB. This only fixes an error when the TAB wraps | |
| 2077 * from one screen line to the next (when 'columns' is not a multiple of | |
| 2078 * 'ts') -- webb. | |
| 2079 */ | |
| 2080 if (*s == TAB && (State & NORMAL) && (!wp->w_p_list || lcs_tab1)) | |
| 5995 | 2081 col += win_lbr_chartabsize(wp, line, s, (colnr_T)col, NULL) - 1; |
| 7 | 2082 |
| 2083 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2162
diff
changeset
|
2084 * Add column offset for 'number', 'relativenumber', 'foldcolumn', etc. |
| 7 | 2085 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2086 width = wp->w_width - win_col_off(wp); |
| 1023 | 2087 if (width <= 0) |
| 2088 return 9999; | |
| 2089 | |
| 2090 lines += 1; | |
| 2091 if (col > width) | |
| 2092 lines += (col - width) / (width + win_col_off2(wp)) + 1; | |
| 2093 return lines; | |
| 7 | 2094 } |
| 2095 | |
| 2096 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2097 plines_m_win(win_T *wp, linenr_T first, linenr_T last) |
| 7 | 2098 { |
| 2099 int count = 0; | |
| 2100 | |
| 2101 while (first <= last) | |
| 2102 { | |
| 2103 #ifdef FEAT_FOLDING | |
| 2104 int x; | |
| 2105 | |
| 2106 /* Check if there are any really folded lines, but also included lines | |
| 2107 * that are maybe folded. */ | |
| 2108 x = foldedCount(wp, first, NULL); | |
| 2109 if (x > 0) | |
| 2110 { | |
| 2111 ++count; /* count 1 for "+-- folded" line */ | |
| 2112 first += x; | |
| 2113 } | |
| 2114 else | |
| 2115 #endif | |
| 2116 { | |
| 2117 #ifdef FEAT_DIFF | |
| 2118 if (first == wp->w_topline) | |
| 2119 count += plines_win_nofill(wp, first, TRUE) + wp->w_topfill; | |
| 2120 else | |
| 2121 #endif | |
| 2122 count += plines_win(wp, first, TRUE); | |
| 2123 ++first; | |
| 2124 } | |
| 2125 } | |
| 2126 return (count); | |
| 2127 } | |
| 2128 | |
| 2129 #if defined(FEAT_VREPLACE) || defined(FEAT_INS_EXPAND) || defined(PROTO) | |
| 2130 /* | |
| 2131 * Insert string "p" at the cursor position. Stops at a NUL byte. | |
| 2132 * Handles Replace mode and multi-byte characters. | |
| 2133 */ | |
| 2134 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2135 ins_bytes(char_u *p) |
| 7 | 2136 { |
| 2137 ins_bytes_len(p, (int)STRLEN(p)); | |
| 2138 } | |
| 2139 #endif | |
| 2140 | |
| 2141 #if defined(FEAT_VREPLACE) || defined(FEAT_INS_EXPAND) \ | |
| 2142 || defined(FEAT_COMMENTS) || defined(FEAT_MBYTE) || defined(PROTO) | |
| 2143 /* | |
| 2144 * Insert string "p" with length "len" at the cursor position. | |
| 2145 * Handles Replace mode and multi-byte characters. | |
| 2146 */ | |
| 2147 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2148 ins_bytes_len(char_u *p, int len) |
| 7 | 2149 { |
| 2150 int i; | |
| 2151 # ifdef FEAT_MBYTE | |
| 2152 int n; | |
| 2153 | |
| 1617 | 2154 if (has_mbyte) |
| 2155 for (i = 0; i < len; i += n) | |
| 2156 { | |
| 2157 if (enc_utf8) | |
| 2158 /* avoid reading past p[len] */ | |
| 2159 n = utfc_ptr2len_len(p + i, len - i); | |
| 2160 else | |
| 2161 n = (*mb_ptr2len)(p + i); | |
| 2162 ins_char_bytes(p + i, n); | |
| 2163 } | |
| 2164 else | |
| 7 | 2165 # endif |
| 1617 | 2166 for (i = 0; i < len; ++i) |
| 2167 ins_char(p[i]); | |
| 7 | 2168 } |
| 2169 #endif | |
| 2170 | |
| 2171 /* | |
| 2172 * Insert or replace a single character at the cursor position. | |
| 2173 * When in REPLACE or VREPLACE mode, replace any existing character. | |
| 2174 * Caller must have prepared for undo. | |
| 2175 * For multi-byte characters we get the whole character, the caller must | |
| 2176 * convert bytes to a character. | |
| 2177 */ | |
| 2178 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2179 ins_char(int c) |
| 7 | 2180 { |
|
10642
c10f367d0dfc
patch 8.0.0211: cannot build without the multi-byte feature
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2181 char_u buf[MB_MAXBYTES + 1]; |
|
c10f367d0dfc
patch 8.0.0211: cannot build without the multi-byte feature
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2182 int n = 1; |
|
c10f367d0dfc
patch 8.0.0211: cannot build without the multi-byte feature
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2183 |
|
10662
bc1c7e799e6e
patch 8.0.0221: unnecessary condition on PROTO
Christian Brabandt <cb@256bit.org>
parents:
10642
diff
changeset
|
2184 #ifdef FEAT_MBYTE |
| 7 | 2185 n = (*mb_char2bytes)(c, buf); |
| 2186 | |
| 2187 /* When "c" is 0x100, 0x200, etc. we don't want to insert a NUL byte. | |
| 2188 * Happens for CTRL-Vu9900. */ | |
| 2189 if (buf[0] == 0) | |
| 2190 buf[0] = '\n'; | |
|
10642
c10f367d0dfc
patch 8.0.0211: cannot build without the multi-byte feature
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2191 #else |
|
c10f367d0dfc
patch 8.0.0211: cannot build without the multi-byte feature
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2192 buf[0] = c; |
|
c10f367d0dfc
patch 8.0.0211: cannot build without the multi-byte feature
Christian Brabandt <cb@256bit.org>
parents:
10571
diff
changeset
|
2193 #endif |
| 7 | 2194 |
| 2195 ins_char_bytes(buf, n); | |
| 2196 } | |
| 2197 | |
| 2198 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2199 ins_char_bytes(char_u *buf, int charlen) |
| 7 | 2200 { |
| 2201 int c = buf[0]; | |
| 2202 int newlen; /* nr of bytes inserted */ | |
| 2203 int oldlen; /* nr of bytes deleted (0 when not replacing) */ | |
| 2204 char_u *p; | |
| 2205 char_u *newp; | |
| 2206 char_u *oldp; | |
| 2207 int linelen; /* length of old line including NUL */ | |
| 2208 colnr_T col; | |
| 2209 linenr_T lnum = curwin->w_cursor.lnum; | |
| 2210 int i; | |
| 2211 | |
| 2212 #ifdef FEAT_VIRTUALEDIT | |
| 2213 /* Break tabs if needed. */ | |
| 2214 if (virtual_active() && curwin->w_cursor.coladd > 0) | |
| 2215 coladvance_force(getviscol()); | |
| 2216 #endif | |
| 2217 | |
| 2218 col = curwin->w_cursor.col; | |
| 2219 oldp = ml_get(lnum); | |
| 2220 linelen = (int)STRLEN(oldp) + 1; | |
| 2221 | |
| 2222 /* The lengths default to the values for when not replacing. */ | |
| 2223 oldlen = 0; | |
| 2224 newlen = charlen; | |
| 2225 | |
| 2226 if (State & REPLACE_FLAG) | |
| 2227 { | |
| 2228 #ifdef FEAT_VREPLACE | |
| 2229 if (State & VREPLACE_FLAG) | |
| 2230 { | |
| 2231 colnr_T new_vcol = 0; /* init for GCC */ | |
| 2232 colnr_T vcol; | |
| 2233 int old_list; | |
| 2234 #ifndef FEAT_MBYTE | |
| 2235 char_u buf[2]; | |
| 2236 #endif | |
| 2237 | |
| 2238 /* | |
| 2239 * Disable 'list' temporarily, unless 'cpo' contains the 'L' flag. | |
| 2240 * Returns the old value of list, so when finished, | |
| 2241 * curwin->w_p_list should be set back to this. | |
| 2242 */ | |
| 2243 old_list = curwin->w_p_list; | |
| 2244 if (old_list && vim_strchr(p_cpo, CPO_LISTWM) == NULL) | |
| 2245 curwin->w_p_list = FALSE; | |
| 2246 | |
| 2247 /* | |
| 2248 * In virtual replace mode each character may replace one or more | |
| 2249 * characters (zero if it's a TAB). Count the number of bytes to | |
| 2250 * be deleted to make room for the new character, counting screen | |
| 2251 * cells. May result in adding spaces to fill a gap. | |
| 2252 */ | |
| 2253 getvcol(curwin, &curwin->w_cursor, NULL, &vcol, NULL); | |
| 2254 #ifndef FEAT_MBYTE | |
| 2255 buf[0] = c; | |
| 2256 buf[1] = NUL; | |
| 2257 #endif | |
| 2258 new_vcol = vcol + chartabsize(buf, vcol); | |
| 2259 while (oldp[col + oldlen] != NUL && vcol < new_vcol) | |
| 2260 { | |
| 2261 vcol += chartabsize(oldp + col + oldlen, vcol); | |
| 2262 /* Don't need to remove a TAB that takes us to the right | |
| 2263 * position. */ | |
| 2264 if (vcol > new_vcol && oldp[col + oldlen] == TAB) | |
| 2265 break; | |
| 2266 #ifdef FEAT_MBYTE | |
| 474 | 2267 oldlen += (*mb_ptr2len)(oldp + col + oldlen); |
| 7 | 2268 #else |
| 2269 ++oldlen; | |
| 2270 #endif | |
| 2271 /* Deleted a bit too much, insert spaces. */ | |
| 2272 if (vcol > new_vcol) | |
| 2273 newlen += vcol - new_vcol; | |
| 2274 } | |
| 2275 curwin->w_p_list = old_list; | |
| 2276 } | |
| 2277 else | |
| 2278 #endif | |
| 2279 if (oldp[col] != NUL) | |
| 2280 { | |
| 2281 /* normal replace */ | |
| 2282 #ifdef FEAT_MBYTE | |
| 474 | 2283 oldlen = (*mb_ptr2len)(oldp + col); |
| 7 | 2284 #else |
| 2285 oldlen = 1; | |
| 2286 #endif | |
| 2287 } | |
| 2288 | |
| 2289 | |
| 2290 /* Push the replaced bytes onto the replace stack, so that they can be | |
| 2291 * put back when BS is used. The bytes of a multi-byte character are | |
| 2292 * done the other way around, so that the first byte is popped off | |
| 2293 * first (it tells the byte length of the character). */ | |
| 2294 replace_push(NUL); | |
| 2295 for (i = 0; i < oldlen; ++i) | |
| 2296 { | |
| 2297 #ifdef FEAT_MBYTE | |
| 1470 | 2298 if (has_mbyte) |
| 2299 i += replace_push_mb(oldp + col + i) - 1; | |
| 2300 else | |
| 2301 #endif | |
| 2302 replace_push(oldp[col + i]); | |
| 7 | 2303 } |
| 2304 } | |
| 2305 | |
| 2306 newp = alloc_check((unsigned)(linelen + newlen - oldlen)); | |
| 2307 if (newp == NULL) | |
| 2308 return; | |
| 2309 | |
| 2310 /* Copy bytes before the cursor. */ | |
| 2311 if (col > 0) | |
| 2312 mch_memmove(newp, oldp, (size_t)col); | |
| 2313 | |
| 2314 /* Copy bytes after the changed character(s). */ | |
| 2315 p = newp + col; | |
|
12690
fad36581f788
patch 8.0.1223: crash when using autocomplete and tab pages
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
2316 if (linelen > col + oldlen) |
|
fad36581f788
patch 8.0.1223: crash when using autocomplete and tab pages
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
2317 mch_memmove(p + newlen, oldp + col + oldlen, |
| 7 | 2318 (size_t)(linelen - col - oldlen)); |
| 2319 | |
| 2320 /* Insert or overwrite the new character. */ | |
| 2321 #ifdef FEAT_MBYTE | |
| 2322 mch_memmove(p, buf, charlen); | |
| 2323 i = charlen; | |
| 2324 #else | |
| 2325 *p = c; | |
| 2326 i = 1; | |
| 2327 #endif | |
| 2328 | |
| 2329 /* Fill with spaces when necessary. */ | |
| 2330 while (i < newlen) | |
| 2331 p[i++] = ' '; | |
| 2332 | |
| 2333 /* Replace the line in the buffer. */ | |
| 2334 ml_replace(lnum, newp, FALSE); | |
| 2335 | |
| 2336 /* mark the buffer as changed and prepare for displaying */ | |
| 2337 changed_bytes(lnum, col); | |
| 2338 | |
| 2339 /* | |
| 2340 * If we're in Insert or Replace mode and 'showmatch' is set, then briefly | |
| 2341 * show the match for right parens and braces. | |
| 2342 */ | |
| 2343 if (p_sm && (State & INSERT) | |
| 2344 && msg_silent == 0 | |
| 674 | 2345 #ifdef FEAT_INS_EXPAND |
| 2346 && !ins_compl_active() | |
| 2347 #endif | |
| 7 | 2348 ) |
| 4029 | 2349 { |
| 2350 #ifdef FEAT_MBYTE | |
| 2351 if (has_mbyte) | |
| 2352 showmatch(mb_ptr2char(buf)); | |
| 2353 else | |
| 2354 #endif | |
| 2355 showmatch(c); | |
| 2356 } | |
| 7 | 2357 |
| 2358 #ifdef FEAT_RIGHTLEFT | |
| 2359 if (!p_ri || (State & REPLACE_FLAG)) | |
| 2360 #endif | |
| 2361 { | |
| 2362 /* Normal insert: move cursor right */ | |
| 2363 #ifdef FEAT_MBYTE | |
| 2364 curwin->w_cursor.col += charlen; | |
| 2365 #else | |
| 2366 ++curwin->w_cursor.col; | |
| 2367 #endif | |
| 2368 } | |
| 2369 /* | |
| 2370 * TODO: should try to update w_row here, to avoid recomputing it later. | |
| 2371 */ | |
| 2372 } | |
| 2373 | |
| 2374 /* | |
| 2375 * Insert a string at the cursor position. | |
| 2376 * Note: Does NOT handle Replace mode. | |
| 2377 * Caller must have prepared for undo. | |
| 2378 */ | |
| 2379 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2380 ins_str(char_u *s) |
| 7 | 2381 { |
| 2382 char_u *oldp, *newp; | |
| 2383 int newlen = (int)STRLEN(s); | |
| 2384 int oldlen; | |
| 2385 colnr_T col; | |
| 2386 linenr_T lnum = curwin->w_cursor.lnum; | |
| 2387 | |
| 2388 #ifdef FEAT_VIRTUALEDIT | |
| 2389 if (virtual_active() && curwin->w_cursor.coladd > 0) | |
| 2390 coladvance_force(getviscol()); | |
| 2391 #endif | |
| 2392 | |
| 2393 col = curwin->w_cursor.col; | |
| 2394 oldp = ml_get(lnum); | |
| 2395 oldlen = (int)STRLEN(oldp); | |
| 2396 | |
| 2397 newp = alloc_check((unsigned)(oldlen + newlen + 1)); | |
| 2398 if (newp == NULL) | |
| 2399 return; | |
| 2400 if (col > 0) | |
| 2401 mch_memmove(newp, oldp, (size_t)col); | |
| 2402 mch_memmove(newp + col, s, (size_t)newlen); | |
| 2403 mch_memmove(newp + col + newlen, oldp + col, (size_t)(oldlen - col + 1)); | |
| 2404 ml_replace(lnum, newp, FALSE); | |
| 2405 changed_bytes(lnum, col); | |
| 2406 curwin->w_cursor.col += newlen; | |
| 2407 } | |
| 2408 | |
| 2409 /* | |
| 2410 * Delete one character under the cursor. | |
| 2411 * If "fixpos" is TRUE, don't leave the cursor on the NUL after the line. | |
| 2412 * Caller must have prepared for undo. | |
| 2413 * | |
| 2414 * return FAIL for failure, OK otherwise | |
| 2415 */ | |
| 2416 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2417 del_char(int fixpos) |
| 7 | 2418 { |
| 2419 #ifdef FEAT_MBYTE | |
| 2420 if (has_mbyte) | |
| 2421 { | |
| 2422 /* Make sure the cursor is at the start of a character. */ | |
| 2423 mb_adjust_cursor(); | |
| 2424 if (*ml_get_cursor() == NUL) | |
| 2425 return FAIL; | |
| 2426 return del_chars(1L, fixpos); | |
| 2427 } | |
| 2428 #endif | |
| 610 | 2429 return del_bytes(1L, fixpos, TRUE); |
| 7 | 2430 } |
| 2431 | |
| 2432 #if defined(FEAT_MBYTE) || defined(PROTO) | |
| 2433 /* | |
| 2434 * Like del_bytes(), but delete characters instead of bytes. | |
| 2435 */ | |
| 2436 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2437 del_chars(long count, int fixpos) |
| 7 | 2438 { |
| 2439 long bytes = 0; | |
| 2440 long i; | |
| 2441 char_u *p; | |
| 2442 int l; | |
| 2443 | |
| 2444 p = ml_get_cursor(); | |
| 2445 for (i = 0; i < count && *p != NUL; ++i) | |
| 2446 { | |
| 474 | 2447 l = (*mb_ptr2len)(p); |
| 7 | 2448 bytes += l; |
| 2449 p += l; | |
| 2450 } | |
| 610 | 2451 return del_bytes(bytes, fixpos, TRUE); |
| 7 | 2452 } |
| 2453 #endif | |
| 2454 | |
| 2455 /* | |
| 2456 * Delete "count" bytes under the cursor. | |
| 2457 * If "fixpos" is TRUE, don't leave the cursor on the NUL after the line. | |
| 2458 * Caller must have prepared for undo. | |
| 2459 * | |
|
13188
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2460 * Return FAIL for failure, OK otherwise. |
| 7 | 2461 */ |
| 2462 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2463 del_bytes( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2464 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2465 int fixpos_arg, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2466 int use_delcombine UNUSED) /* 'delcombine' option applies */ |
| 7 | 2467 { |
| 2468 char_u *oldp, *newp; | |
| 2469 colnr_T oldlen; | |
| 2470 linenr_T lnum = curwin->w_cursor.lnum; | |
| 2471 colnr_T col = curwin->w_cursor.col; | |
| 2472 int was_alloced; | |
| 2473 long movelen; | |
| 777 | 2474 int fixpos = fixpos_arg; |
| 7 | 2475 |
| 2476 oldp = ml_get(lnum); | |
| 2477 oldlen = (int)STRLEN(oldp); | |
| 2478 | |
|
13188
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2479 /* Can't do anything when the cursor is on the NUL after the line. */ |
| 7 | 2480 if (col >= oldlen) |
| 2481 return FAIL; | |
| 2482 | |
|
13188
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2483 /* If "count" is zero there is nothing to do. */ |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2484 if (count == 0) |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2485 return OK; |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2486 |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2487 /* If "count" is negative the caller must be doing something wrong. */ |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2488 if (count < 1) |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2489 { |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2490 IEMSGN("E950: Invalid count for del_bytes(): %ld", count); |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2491 return FAIL; |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2492 } |
|
a49a5419a83f
patch 8.0.1468: illegal memory access in del_bytes()
Christian Brabandt <cb@256bit.org>
parents:
13180
diff
changeset
|
2493 |
| 7 | 2494 #ifdef FEAT_MBYTE |
| 2495 /* If 'delcombine' is set and deleting (less than) one character, only | |
| 2496 * delete the last combining character. */ | |
| 610 | 2497 if (p_deco && use_delcombine && enc_utf8 |
| 2498 && utfc_ptr2len(oldp + col) >= count) | |
| 7 | 2499 { |
| 714 | 2500 int cc[MAX_MCO]; |
| 7 | 2501 int n; |
| 2502 | |
| 714 | 2503 (void)utfc_ptr2char(oldp + col, cc); |
| 2504 if (cc[0] != NUL) | |
| 7 | 2505 { |
| 2506 /* Find the last composing char, there can be several. */ | |
| 2507 n = col; | |
| 2508 do | |
| 2509 { | |
| 2510 col = n; | |
| 474 | 2511 count = utf_ptr2len(oldp + n); |
| 7 | 2512 n += count; |
| 2513 } while (UTF_COMPOSINGLIKE(oldp + col, oldp + n)); | |
| 2514 fixpos = 0; | |
| 2515 } | |
| 2516 } | |
| 2517 #endif | |
| 2518 | |
| 2519 /* | |
| 2520 * When count is too big, reduce it. | |
| 2521 */ | |
| 2522 movelen = (long)oldlen - (long)col - count + 1; /* includes trailing NUL */ | |
| 2523 if (movelen <= 1) | |
| 2524 { | |
| 2525 /* | |
| 2526 * If we just took off the last character of a non-blank line, and | |
| 777 | 2527 * fixpos is TRUE, we don't want to end up positioned at the NUL, |
| 2528 * unless "restart_edit" is set or 'virtualedit' contains "onemore". | |
| 7 | 2529 */ |
| 777 | 2530 if (col > 0 && fixpos && restart_edit == 0 |
| 2531 #ifdef FEAT_VIRTUALEDIT | |
| 2532 && (ve_flags & VE_ONEMORE) == 0 | |
| 2533 #endif | |
| 2534 ) | |
| 7 | 2535 { |
| 2536 --curwin->w_cursor.col; | |
| 2537 #ifdef FEAT_VIRTUALEDIT | |
| 2538 curwin->w_cursor.coladd = 0; | |
| 2539 #endif | |
| 2540 #ifdef FEAT_MBYTE | |
| 2541 if (has_mbyte) | |
| 2542 curwin->w_cursor.col -= | |
| 2543 (*mb_head_off)(oldp, oldp + curwin->w_cursor.col); | |
| 2544 #endif | |
| 2545 } | |
| 2546 count = oldlen - col; | |
| 2547 movelen = 1; | |
| 2548 } | |
| 2549 | |
| 2550 /* | |
| 2551 * If the old line has been allocated the deletion can be done in the | |
| 2552 * existing line. Otherwise a new line has to be allocated | |
| 1532 | 2553 * Can't do this when using Netbeans, because we would need to invoke |
| 2554 * netbeans_removed(), which deallocates the line. Let ml_replace() take | |
|
2460
b8eb7c0f74c2
Remove unused variable and STRLEN(). (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2435
diff
changeset
|
2555 * care of notifying Netbeans. |
| 7 | 2556 */ |
| 2557 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 2558 if (netbeans_active()) |
| 1532 | 2559 was_alloced = FALSE; |
| 2560 else | |
| 2561 #endif | |
| 2562 was_alloced = ml_line_alloced(); /* check if oldp was allocated */ | |
| 7 | 2563 if (was_alloced) |
| 2564 newp = oldp; /* use same allocated memory */ | |
| 2565 else | |
| 2566 { /* need to allocate a new line */ | |
| 2567 newp = alloc((unsigned)(oldlen + 1 - count)); | |
| 2568 if (newp == NULL) | |
| 2569 return FAIL; | |
| 2570 mch_memmove(newp, oldp, (size_t)col); | |
| 2571 } | |
| 2572 mch_memmove(newp + col, oldp + col + count, (size_t)movelen); | |
| 2573 if (!was_alloced) | |
| 2574 ml_replace(lnum, newp, FALSE); | |
| 2575 | |
| 2576 /* mark the buffer as changed and prepare for displaying */ | |
| 2577 changed_bytes(lnum, curwin->w_cursor.col); | |
| 2578 | |
| 2579 return OK; | |
| 2580 } | |
| 2581 | |
| 2582 /* | |
| 2583 * Delete from cursor to end of line. | |
| 2584 * Caller must have prepared for undo. | |
| 2585 * | |
| 2586 * return FAIL for failure, OK otherwise | |
| 2587 */ | |
| 2588 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2589 truncate_line( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2590 int fixpos) /* if TRUE fix the cursor position when done */ |
| 7 | 2591 { |
| 2592 char_u *newp; | |
| 2593 linenr_T lnum = curwin->w_cursor.lnum; | |
| 2594 colnr_T col = curwin->w_cursor.col; | |
| 2595 | |
| 2596 if (col == 0) | |
| 2597 newp = vim_strsave((char_u *)""); | |
| 2598 else | |
| 2599 newp = vim_strnsave(ml_get(lnum), col); | |
| 2600 | |
| 2601 if (newp == NULL) | |
| 2602 return FAIL; | |
| 2603 | |
| 2604 ml_replace(lnum, newp, FALSE); | |
| 2605 | |
| 2606 /* mark the buffer as changed and prepare for displaying */ | |
| 2607 changed_bytes(lnum, curwin->w_cursor.col); | |
| 2608 | |
| 2609 /* | |
| 2610 * If "fixpos" is TRUE we don't want to end up positioned at the NUL. | |
| 2611 */ | |
| 2612 if (fixpos && curwin->w_cursor.col > 0) | |
| 2613 --curwin->w_cursor.col; | |
| 2614 | |
| 2615 return OK; | |
| 2616 } | |
| 2617 | |
| 2618 /* | |
| 2619 * Delete "nlines" lines at the cursor. | |
| 2620 * Saves the lines for undo first if "undo" is TRUE. | |
| 2621 */ | |
| 2622 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2623 del_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2624 long nlines, /* number of lines to delete */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2625 int undo) /* if TRUE, prepare for undo */ |
| 7 | 2626 { |
| 2627 long n; | |
| 1929 | 2628 linenr_T first = curwin->w_cursor.lnum; |
| 7 | 2629 |
| 2630 if (nlines <= 0) | |
| 2631 return; | |
| 2632 | |
| 2633 /* save the deleted lines for undo */ | |
| 1929 | 2634 if (undo && u_savedel(first, nlines) == FAIL) |
| 7 | 2635 return; |
| 2636 | |
| 2637 for (n = 0; n < nlines; ) | |
| 2638 { | |
| 2639 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to delete */ | |
| 2640 break; | |
| 2641 | |
| 1929 | 2642 ml_delete(first, TRUE); |
| 7 | 2643 ++n; |
| 2644 | |
| 2645 /* If we delete the last line in the file, stop */ | |
| 1929 | 2646 if (first > curbuf->b_ml.ml_line_count) |
| 7 | 2647 break; |
| 2648 } | |
| 1929 | 2649 |
| 2650 /* Correct the cursor position before calling deleted_lines_mark(), it may | |
| 2651 * trigger a callback to display the cursor. */ | |
| 7 | 2652 curwin->w_cursor.col = 0; |
| 2653 check_cursor_lnum(); | |
| 1929 | 2654 |
| 2655 /* adjust marks, mark the buffer as changed and prepare for displaying */ | |
| 2656 deleted_lines_mark(first, n); | |
| 7 | 2657 } |
| 2658 | |
| 2659 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2660 gchar_pos(pos_T *pos) |
| 7 | 2661 { |
|
13082
a80082fd1a1d
patch 8.0.1416: crash when searching for a sentence
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
2662 char_u *ptr; |
|
a80082fd1a1d
patch 8.0.1416: crash when searching for a sentence
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
2663 |
|
a80082fd1a1d
patch 8.0.1416: crash when searching for a sentence
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
2664 /* When searching columns is sometimes put at the end of a line. */ |
|
a80082fd1a1d
patch 8.0.1416: crash when searching for a sentence
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
2665 if (pos->col == MAXCOL) |
|
a80082fd1a1d
patch 8.0.1416: crash when searching for a sentence
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
2666 return NUL; |
|
a80082fd1a1d
patch 8.0.1416: crash when searching for a sentence
Christian Brabandt <cb@256bit.org>
parents:
12865
diff
changeset
|
2667 ptr = ml_get_pos(pos); |
| 7 | 2668 #ifdef FEAT_MBYTE |
| 2669 if (has_mbyte) | |
| 2670 return (*mb_ptr2char)(ptr); | |
| 2671 #endif | |
| 2672 return (int)*ptr; | |
| 2673 } | |
| 2674 | |
| 2675 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2676 gchar_cursor(void) |
| 7 | 2677 { |
| 2678 #ifdef FEAT_MBYTE | |
| 2679 if (has_mbyte) | |
| 2680 return (*mb_ptr2char)(ml_get_cursor()); | |
| 2681 #endif | |
| 2682 return (int)*ml_get_cursor(); | |
| 2683 } | |
| 2684 | |
| 2685 /* | |
| 2686 * Write a character at the current cursor position. | |
| 2687 * It is directly written into the block. | |
| 2688 */ | |
| 2689 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2690 pchar_cursor(int c) |
| 7 | 2691 { |
| 2692 *(ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE) | |
| 2693 + curwin->w_cursor.col) = c; | |
| 2694 } | |
| 2695 | |
| 2696 /* | |
| 2697 * When extra == 0: Return TRUE if the cursor is before or on the first | |
| 2698 * non-blank in the line. | |
| 2699 * When extra == 1: Return TRUE if the cursor is before the first non-blank in | |
| 2700 * the line. | |
| 2701 */ | |
| 2702 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2703 inindent(int extra) |
| 7 | 2704 { |
| 2705 char_u *ptr; | |
| 2706 colnr_T col; | |
| 2707 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
2708 for (col = 0, ptr = ml_get_curline(); VIM_ISWHITE(*ptr); ++col) |
| 7 | 2709 ++ptr; |
| 2710 if (col >= curwin->w_cursor.col + extra) | |
| 2711 return TRUE; | |
| 2712 else | |
| 2713 return FALSE; | |
| 2714 } | |
| 2715 | |
| 2716 /* | |
| 2717 * Skip to next part of an option argument: Skip space and comma. | |
| 2718 */ | |
| 2719 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2720 skip_to_option_part(char_u *p) |
| 7 | 2721 { |
| 2722 if (*p == ',') | |
| 2723 ++p; | |
| 2724 while (*p == ' ') | |
| 2725 ++p; | |
| 2726 return p; | |
| 2727 } | |
| 2728 | |
| 2729 /* | |
| 2189 | 2730 * Call this function when something in the current buffer is changed. |
| 7 | 2731 * |
| 2732 * Most often called through changed_bytes() and changed_lines(), which also | |
| 2733 * mark the area of the display to be redrawn. | |
| 2189 | 2734 * |
| 2735 * Careful: may trigger autocommands that reload the buffer. | |
| 7 | 2736 */ |
| 2737 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2738 changed(void) |
| 7 | 2739 { |
| 2740 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2741 if (p_imst == IM_ON_THE_SPOT) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2742 { |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2743 /* The text of the preediting area is inserted, but this doesn't |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2744 * mean a change of the buffer yet. That is delayed until the |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2745 * text is committed. (this means preedit becomes empty) */ |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2746 if (im_is_preediting() && !xim_changed_while_preediting) |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2747 return; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2748 xim_changed_while_preediting = FALSE; |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12269
diff
changeset
|
2749 } |
| 7 | 2750 #endif |
| 2751 | |
| 2752 if (!curbuf->b_changed) | |
| 2753 { | |
| 2754 int save_msg_scroll = msg_scroll; | |
| 2755 | |
| 819 | 2756 /* Give a warning about changing a read-only file. This may also |
| 2757 * check-out the file, thus change "curbuf"! */ | |
| 7 | 2758 change_warning(0); |
| 819 | 2759 |
| 7 | 2760 /* Create a swap file if that is wanted. |
| 2761 * Don't do this for "nofile" and "nowrite" buffer types. */ | |
| 2762 if (curbuf->b_may_swap | |
| 2763 #ifdef FEAT_QUICKFIX | |
| 2764 && !bt_dontwrite(curbuf) | |
| 2765 #endif | |
| 2766 ) | |
| 2767 { | |
|
7582
e0acbccdf1fc
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
Christian Brabandt <cb@256bit.org>
parents:
7408
diff
changeset
|
2768 int save_need_wait_return = need_wait_return; |
|
e0acbccdf1fc
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
Christian Brabandt <cb@256bit.org>
parents:
7408
diff
changeset
|
2769 |
|
e0acbccdf1fc
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
Christian Brabandt <cb@256bit.org>
parents:
7408
diff
changeset
|
2770 need_wait_return = FALSE; |
| 7 | 2771 ml_open_file(curbuf); |
| 2772 | |
| 2773 /* The ml_open_file() can cause an ATTENTION message. | |
| 2774 * Wait two seconds, to make sure the user reads this unexpected | |
| 2775 * message. Since we could be anywhere, call wait_return() now, | |
| 2776 * and don't let the emsg() set msg_scroll. */ | |
| 2777 if (need_wait_return && emsg_silent == 0) | |
| 2778 { | |
| 2779 out_flush(); | |
| 2780 ui_delay(2000L, TRUE); | |
| 2781 wait_return(TRUE); | |
| 2782 msg_scroll = save_msg_scroll; | |
| 2783 } | |
|
7582
e0acbccdf1fc
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
Christian Brabandt <cb@256bit.org>
parents:
7408
diff
changeset
|
2784 else |
|
e0acbccdf1fc
commit https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
Christian Brabandt <cb@256bit.org>
parents:
7408
diff
changeset
|
2785 need_wait_return = save_need_wait_return; |
| 7 | 2786 } |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2787 changed_int(); |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2788 } |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10932
diff
changeset
|
2789 ++CHANGEDTICK(curbuf); |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2790 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2791 |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2792 /* |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2793 * Internal part of changed(), no user interaction. |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2794 */ |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2795 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2796 changed_int(void) |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2797 { |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2798 curbuf->b_changed = TRUE; |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2799 ml_setflags(curbuf); |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2800 check_status(curbuf); |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2801 redraw_tabline = TRUE; |
|
2165
733f0dc510c3
Undo changes that are meant for the Vim 7.3 branch.
Bram Moolenaar <bram@vim.org>
parents:
2162
diff
changeset
|
2802 #ifdef FEAT_TITLE |
|
2162
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2803 need_maketitle = TRUE; /* set window title later */ |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2804 #endif |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2805 } |
|
0527eb0f6918
After recovery check if the text changed. If it did mark the buffer as
Bram Moolenaar <bram@vim.org>
parents:
2129
diff
changeset
|
2806 |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
2807 static void changedOneline(buf_T *buf, linenr_T lnum); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
2808 static void changed_lines_buf(buf_T *buf, linenr_T lnum, linenr_T lnume, long xtra); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
2809 static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra); |
| 7 | 2810 |
| 2811 /* | |
| 2812 * Changed bytes within a single line for the current buffer. | |
| 2813 * - marks the windows on this buffer to be redisplayed | |
| 2814 * - marks the buffer changed by calling changed() | |
| 2815 * - invalidates cached values | |
| 2189 | 2816 * Careful: may trigger autocommands that reload the buffer. |
| 7 | 2817 */ |
| 2818 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2819 changed_bytes(linenr_T lnum, colnr_T col) |
| 7 | 2820 { |
| 265 | 2821 changedOneline(curbuf, lnum); |
| 7 | 2822 changed_common(lnum, col, lnum + 1, 0L); |
| 265 | 2823 |
| 2824 #ifdef FEAT_DIFF | |
| 2825 /* Diff highlighting in other diff windows may need to be updated too. */ | |
| 2826 if (curwin->w_p_diff) | |
| 2827 { | |
| 2828 win_T *wp; | |
| 2829 linenr_T wlnum; | |
| 2830 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
2831 FOR_ALL_WINDOWS(wp) |
| 265 | 2832 if (wp->w_p_diff && wp != curwin) |
| 2833 { | |
| 2834 redraw_win_later(wp, VALID); | |
| 2835 wlnum = diff_lnum_win(lnum, wp); | |
| 2836 if (wlnum > 0) | |
| 2837 changedOneline(wp->w_buffer, wlnum); | |
| 2838 } | |
| 2839 } | |
| 2840 #endif | |
| 7 | 2841 } |
| 2842 | |
| 2843 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2844 changedOneline(buf_T *buf, linenr_T lnum) |
| 7 | 2845 { |
| 265 | 2846 if (buf->b_mod_set) |
| 7 | 2847 { |
| 2848 /* find the maximum area that must be redisplayed */ | |
| 265 | 2849 if (lnum < buf->b_mod_top) |
| 2850 buf->b_mod_top = lnum; | |
| 2851 else if (lnum >= buf->b_mod_bot) | |
| 2852 buf->b_mod_bot = lnum + 1; | |
| 7 | 2853 } |
| 2854 else | |
| 2855 { | |
| 2856 /* set the area that must be redisplayed to one line */ | |
| 265 | 2857 buf->b_mod_set = TRUE; |
| 2858 buf->b_mod_top = lnum; | |
| 2859 buf->b_mod_bot = lnum + 1; | |
| 2860 buf->b_mod_xlines = 0; | |
| 7 | 2861 } |
| 2862 } | |
| 2863 | |
| 2864 /* | |
| 2865 * Appended "count" lines below line "lnum" in the current buffer. | |
| 2866 * Must be called AFTER the change and after mark_adjust(). | |
| 2867 * Takes care of marking the buffer to be redrawn and sets the changed flag. | |
| 2868 */ | |
| 2869 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2870 appended_lines(linenr_T lnum, long count) |
| 7 | 2871 { |
| 2872 changed_lines(lnum + 1, 0, lnum + 1, count); | |
| 2873 } | |
| 2874 | |
| 2875 /* | |
| 2876 * Like appended_lines(), but adjust marks first. | |
| 2877 */ | |
| 2878 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2879 appended_lines_mark(linenr_T lnum, long count) |
| 7 | 2880 { |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
2881 /* Skip mark_adjust when adding a line after the last one, there can't |
|
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
2882 * be marks there. But it's still needed in diff mode. */ |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
2883 if (lnum + count < curbuf->b_ml.ml_line_count |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
2884 #ifdef FEAT_DIFF |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
2885 || curwin->w_p_diff |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
2886 #endif |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
2887 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
2888 mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L); |
| 7 | 2889 changed_lines(lnum + 1, 0, lnum + 1, count); |
| 2890 } | |
| 2891 | |
| 2892 /* | |
| 2893 * Deleted "count" lines at line "lnum" in the current buffer. | |
| 2894 * Must be called AFTER the change and after mark_adjust(). | |
| 2895 * Takes care of marking the buffer to be redrawn and sets the changed flag. | |
| 2896 */ | |
| 2897 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2898 deleted_lines(linenr_T lnum, long count) |
| 7 | 2899 { |
| 2900 changed_lines(lnum, 0, lnum + count, -count); | |
| 2901 } | |
| 2902 | |
| 2903 /* | |
| 2904 * Like deleted_lines(), but adjust marks first. | |
| 1929 | 2905 * Make sure the cursor is on a valid line before calling, a GUI callback may |
| 2906 * be triggered to display the cursor. | |
| 7 | 2907 */ |
| 2908 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2909 deleted_lines_mark(linenr_T lnum, long count) |
| 7 | 2910 { |
| 2911 mark_adjust(lnum, (linenr_T)(lnum + count - 1), (long)MAXLNUM, -count); | |
| 2912 changed_lines(lnum, 0, lnum + count, -count); | |
| 2913 } | |
| 2914 | |
| 2915 /* | |
| 2916 * Changed lines for the current buffer. | |
| 2917 * Must be called AFTER the change and after mark_adjust(). | |
| 2918 * - mark the buffer changed by calling changed() | |
| 2919 * - mark the windows on this buffer to be redisplayed | |
| 2920 * - invalidate cached values | |
| 2921 * "lnum" is the first line that needs displaying, "lnume" the first line | |
| 2922 * below the changed lines (BEFORE the change). | |
| 2923 * When only inserting lines, "lnum" and "lnume" are equal. | |
| 2924 * Takes care of calling changed() and updating b_mod_*. | |
| 2189 | 2925 * Careful: may trigger autocommands that reload the buffer. |
| 7 | 2926 */ |
| 2927 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2928 changed_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2929 linenr_T lnum, /* first line with change */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2930 colnr_T col, /* column in first line with change */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2931 linenr_T lnume, /* line below last changed line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2932 long xtra) /* number of extra lines (negative when deleting) */ |
| 7 | 2933 { |
| 265 | 2934 changed_lines_buf(curbuf, lnum, lnume, xtra); |
| 2935 | |
| 2936 #ifdef FEAT_DIFF | |
| 2937 if (xtra == 0 && curwin->w_p_diff) | |
| 2938 { | |
| 2939 /* When the number of lines doesn't change then mark_adjust() isn't | |
| 2940 * called and other diff buffers still need to be marked for | |
| 2941 * displaying. */ | |
| 2942 win_T *wp; | |
| 2943 linenr_T wlnum; | |
| 2944 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
2945 FOR_ALL_WINDOWS(wp) |
| 265 | 2946 if (wp->w_p_diff && wp != curwin) |
| 2947 { | |
| 2948 redraw_win_later(wp, VALID); | |
| 2949 wlnum = diff_lnum_win(lnum, wp); | |
| 2950 if (wlnum > 0) | |
| 2951 changed_lines_buf(wp->w_buffer, wlnum, | |
| 2952 lnume - lnum + wlnum, 0L); | |
| 2953 } | |
| 2954 } | |
| 2955 #endif | |
| 2956 | |
| 2957 changed_common(lnum, col, lnume, xtra); | |
| 2958 } | |
| 2959 | |
| 2960 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2961 changed_lines_buf( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2962 buf_T *buf, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2963 linenr_T lnum, /* first line with change */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2964 linenr_T lnume, /* line below last changed line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2965 long xtra) /* number of extra lines (negative when deleting) */ |
| 265 | 2966 { |
| 2967 if (buf->b_mod_set) | |
| 7 | 2968 { |
| 2969 /* find the maximum area that must be redisplayed */ | |
| 265 | 2970 if (lnum < buf->b_mod_top) |
| 2971 buf->b_mod_top = lnum; | |
| 2972 if (lnum < buf->b_mod_bot) | |
| 7 | 2973 { |
| 2974 /* adjust old bot position for xtra lines */ | |
| 265 | 2975 buf->b_mod_bot += xtra; |
| 2976 if (buf->b_mod_bot < lnum) | |
| 2977 buf->b_mod_bot = lnum; | |
| 7 | 2978 } |
| 265 | 2979 if (lnume + xtra > buf->b_mod_bot) |
| 2980 buf->b_mod_bot = lnume + xtra; | |
| 2981 buf->b_mod_xlines += xtra; | |
| 7 | 2982 } |
| 2983 else | |
| 2984 { | |
| 2985 /* set the area that must be redisplayed */ | |
| 265 | 2986 buf->b_mod_set = TRUE; |
| 2987 buf->b_mod_top = lnum; | |
| 2988 buf->b_mod_bot = lnume + xtra; | |
| 2989 buf->b_mod_xlines = xtra; | |
| 2990 } | |
| 7 | 2991 } |
| 2992 | |
| 2189 | 2993 /* |
| 2994 * Common code for when a change is was made. | |
| 2995 * See changed_lines() for the arguments. | |
| 2996 * Careful: may trigger autocommands that reload the buffer. | |
| 2997 */ | |
| 7 | 2998 static void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
2999 changed_common( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3000 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3001 colnr_T col, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3002 linenr_T lnume, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3003 long xtra) |
| 7 | 3004 { |
| 3005 win_T *wp; | |
| 1863 | 3006 tabpage_T *tp; |
| 7 | 3007 int i; |
| 3008 #ifdef FEAT_JUMPLIST | |
| 3009 int cols; | |
| 3010 pos_T *p; | |
| 3011 int add; | |
| 3012 #endif | |
| 3013 | |
| 3014 /* mark the buffer as modified */ | |
| 3015 changed(); | |
| 3016 | |
| 3017 /* set the '. mark */ | |
| 3018 if (!cmdmod.keepjumps) | |
| 3019 { | |
| 3020 curbuf->b_last_change.lnum = lnum; | |
| 3021 curbuf->b_last_change.col = col; | |
| 3022 | |
| 3023 #ifdef FEAT_JUMPLIST | |
| 3024 /* Create a new entry if a new undo-able change was started or we | |
| 3025 * don't have an entry yet. */ | |
| 3026 if (curbuf->b_new_change || curbuf->b_changelistlen == 0) | |
| 3027 { | |
| 3028 if (curbuf->b_changelistlen == 0) | |
| 3029 add = TRUE; | |
| 3030 else | |
| 3031 { | |
| 3032 /* Don't create a new entry when the line number is the same | |
| 3033 * as the last one and the column is not too far away. Avoids | |
| 3034 * creating many entries for typing "xxxxx". */ | |
| 3035 p = &curbuf->b_changelist[curbuf->b_changelistlen - 1]; | |
| 3036 if (p->lnum != lnum) | |
| 3037 add = TRUE; | |
| 3038 else | |
| 3039 { | |
| 3040 cols = comp_textwidth(FALSE); | |
| 3041 if (cols == 0) | |
| 3042 cols = 79; | |
| 3043 add = (p->col + cols < col || col + cols < p->col); | |
| 3044 } | |
| 3045 } | |
| 3046 if (add) | |
| 3047 { | |
| 3048 /* This is the first of a new sequence of undo-able changes | |
| 3049 * and it's at some distance of the last change. Use a new | |
| 3050 * position in the changelist. */ | |
| 3051 curbuf->b_new_change = FALSE; | |
| 3052 | |
| 3053 if (curbuf->b_changelistlen == JUMPLISTSIZE) | |
| 3054 { | |
| 3055 /* changelist is full: remove oldest entry */ | |
| 3056 curbuf->b_changelistlen = JUMPLISTSIZE - 1; | |
| 3057 mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1, | |
| 3058 sizeof(pos_T) * (JUMPLISTSIZE - 1)); | |
| 1863 | 3059 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 3060 { |
| 3061 /* Correct position in changelist for other windows on | |
| 3062 * this buffer. */ | |
| 3063 if (wp->w_buffer == curbuf && wp->w_changelistidx > 0) | |
| 3064 --wp->w_changelistidx; | |
| 3065 } | |
| 3066 } | |
| 1863 | 3067 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 3068 { |
| 3069 /* For other windows, if the position in the changelist is | |
| 3070 * at the end it stays at the end. */ | |
| 3071 if (wp->w_buffer == curbuf | |
| 3072 && wp->w_changelistidx == curbuf->b_changelistlen) | |
| 3073 ++wp->w_changelistidx; | |
| 3074 } | |
| 3075 ++curbuf->b_changelistlen; | |
| 3076 } | |
| 3077 } | |
| 3078 curbuf->b_changelist[curbuf->b_changelistlen - 1] = | |
| 3079 curbuf->b_last_change; | |
| 3080 /* The current window is always after the last change, so that "g," | |
| 3081 * takes you back to it. */ | |
| 3082 curwin->w_changelistidx = curbuf->b_changelistlen; | |
| 3083 #endif | |
| 3084 } | |
| 3085 | |
| 1863 | 3086 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 3087 { |
| 3088 if (wp->w_buffer == curbuf) | |
| 3089 { | |
| 3090 /* Mark this window to be redrawn later. */ | |
| 3091 if (wp->w_redr_type < VALID) | |
| 3092 wp->w_redr_type = VALID; | |
| 3093 | |
| 3094 /* Check if a change in the buffer has invalidated the cached | |
| 3095 * values for the cursor. */ | |
| 3096 #ifdef FEAT_FOLDING | |
| 3097 /* | |
| 3098 * Update the folds for this window. Can't postpone this, because | |
| 3099 * a following operator might work on the whole fold: ">>dd". | |
| 3100 */ | |
| 3101 foldUpdate(wp, lnum, lnume + xtra - 1); | |
| 3102 | |
| 3103 /* The change may cause lines above or below the change to become | |
| 3104 * included in a fold. Set lnum/lnume to the first/last line that | |
| 3105 * might be displayed differently. | |
| 3106 * Set w_cline_folded here as an efficient way to update it when | |
| 3107 * inserting lines just above a closed fold. */ | |
| 3108 i = hasFoldingWin(wp, lnum, &lnum, NULL, FALSE, NULL); | |
| 3109 if (wp->w_cursor.lnum == lnum) | |
| 3110 wp->w_cline_folded = i; | |
| 3111 i = hasFoldingWin(wp, lnume, NULL, &lnume, FALSE, NULL); | |
| 3112 if (wp->w_cursor.lnum == lnume) | |
| 3113 wp->w_cline_folded = i; | |
| 3114 | |
| 3115 /* If the changed line is in a range of previously folded lines, | |
| 3116 * compare with the first line in that range. */ | |
| 3117 if (wp->w_cursor.lnum <= lnum) | |
| 3118 { | |
| 3119 i = find_wl_entry(wp, lnum); | |
| 3120 if (i >= 0 && wp->w_cursor.lnum > wp->w_lines[i].wl_lnum) | |
| 3121 changed_line_abv_curs_win(wp); | |
| 3122 } | |
| 3123 #endif | |
| 3124 | |
| 3125 if (wp->w_cursor.lnum > lnum) | |
| 3126 changed_line_abv_curs_win(wp); | |
| 3127 else if (wp->w_cursor.lnum == lnum && wp->w_cursor.col >= col) | |
| 3128 changed_cline_bef_curs_win(wp); | |
| 3129 if (wp->w_botline >= lnum) | |
| 3130 { | |
| 3131 /* Assume that botline doesn't change (inserted lines make | |
| 3132 * other lines scroll down below botline). */ | |
| 3133 approximate_botline_win(wp); | |
| 3134 } | |
| 3135 | |
| 3136 /* Check if any w_lines[] entries have become invalid. | |
| 3137 * For entries below the change: Correct the lnums for | |
| 3138 * inserted/deleted lines. Makes it possible to stop displaying | |
| 3139 * after the change. */ | |
| 3140 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 3141 if (wp->w_lines[i].wl_valid) | |
| 3142 { | |
| 3143 if (wp->w_lines[i].wl_lnum >= lnum) | |
| 3144 { | |
| 3145 if (wp->w_lines[i].wl_lnum < lnume) | |
| 3146 { | |
| 3147 /* line included in change */ | |
| 3148 wp->w_lines[i].wl_valid = FALSE; | |
| 3149 } | |
| 3150 else if (xtra != 0) | |
| 3151 { | |
| 3152 /* line below change */ | |
| 3153 wp->w_lines[i].wl_lnum += xtra; | |
| 3154 #ifdef FEAT_FOLDING | |
| 3155 wp->w_lines[i].wl_lastlnum += xtra; | |
| 3156 #endif | |
| 3157 } | |
| 3158 } | |
| 3159 #ifdef FEAT_FOLDING | |
| 3160 else if (wp->w_lines[i].wl_lastlnum >= lnum) | |
| 3161 { | |
| 3162 /* change somewhere inside this range of folded lines, | |
| 3163 * may need to be redrawn */ | |
| 3164 wp->w_lines[i].wl_valid = FALSE; | |
| 3165 } | |
| 3166 #endif | |
| 3167 } | |
| 1987 | 3168 |
| 3169 #ifdef FEAT_FOLDING | |
| 3170 /* Take care of side effects for setting w_topline when folds have | |
| 3171 * changed. Esp. when the buffer was changed in another window. */ | |
| 3172 if (hasAnyFolding(wp)) | |
| 3173 set_topline(wp, wp->w_topline); | |
| 3174 #endif | |
| 5885 | 3175 /* relative numbering may require updating more */ |
| 3176 if (wp->w_p_rnu) | |
| 3177 redraw_win_later(wp, SOME_VALID); | |
| 7 | 3178 } |
| 3179 } | |
| 3180 | |
| 3181 /* Call update_screen() later, which checks out what needs to be redrawn, | |
| 3182 * since it notices b_mod_set and then uses b_mod_*. */ | |
| 3183 if (must_redraw < VALID) | |
| 3184 must_redraw = VALID; | |
| 694 | 3185 |
| 3186 /* when the cursor line is changed always trigger CursorMoved */ | |
| 1010 | 3187 if (lnum <= curwin->w_cursor.lnum |
| 3188 && lnume + (xtra < 0 ? -xtra : xtra) > curwin->w_cursor.lnum) | |
| 694 | 3189 last_cursormoved.lnum = 0; |
| 7 | 3190 } |
| 3191 | |
| 3192 /* | |
| 3193 * unchanged() is called when the changed flag must be reset for buffer 'buf' | |
| 3194 */ | |
| 3195 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3196 unchanged( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3197 buf_T *buf, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3198 int ff) /* also reset 'fileformat' */ |
| 7 | 3199 { |
| 2685 | 3200 if (buf->b_changed || (ff && file_ff_differs(buf, FALSE))) |
| 7 | 3201 { |
| 3202 buf->b_changed = 0; | |
| 39 | 3203 ml_setflags(buf); |
| 7 | 3204 if (ff) |
| 3205 save_file_ff(buf); | |
| 3206 check_status(buf); | |
| 673 | 3207 redraw_tabline = TRUE; |
| 7 | 3208 #ifdef FEAT_TITLE |
| 3209 need_maketitle = TRUE; /* set window title later */ | |
| 3210 #endif | |
| 3211 } | |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10932
diff
changeset
|
3212 ++CHANGEDTICK(buf); |
| 7 | 3213 #ifdef FEAT_NETBEANS_INTG |
| 3214 netbeans_unmodified(buf); | |
| 3215 #endif | |
| 3216 } | |
| 3217 | |
| 3218 /* | |
| 3219 * check_status: called when the status bars for the buffer 'buf' | |
| 3220 * need to be updated | |
| 3221 */ | |
| 3222 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3223 check_status(buf_T *buf) |
| 7 | 3224 { |
| 3225 win_T *wp; | |
| 3226 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
3227 FOR_ALL_WINDOWS(wp) |
| 7 | 3228 if (wp->w_buffer == buf && wp->w_status_height) |
| 3229 { | |
| 3230 wp->w_redr_status = TRUE; | |
| 3231 if (must_redraw < VALID) | |
| 3232 must_redraw = VALID; | |
| 3233 } | |
| 3234 } | |
| 3235 | |
| 3236 /* | |
| 3237 * If the file is readonly, give a warning message with the first change. | |
| 3238 * Don't do this for autocommands. | |
| 3239 * Don't use emsg(), because it flushes the macro buffer. | |
| 548 | 3240 * If we have undone all changes b_changed will be FALSE, but "b_did_warn" |
| 7 | 3241 * will be TRUE. |
| 2189 | 3242 * Careful: may trigger autocommands that reload the buffer. |
| 7 | 3243 */ |
| 3244 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3245 change_warning( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3246 int col) /* column for message; non-zero when in insert |
| 7 | 3247 mode and 'showmode' is on */ |
| 3248 { | |
| 1848 | 3249 static char *w_readonly = N_("W10: Warning: Changing a readonly file"); |
| 3250 | |
| 7 | 3251 if (curbuf->b_did_warn == FALSE |
| 3252 && curbufIsChanged() == 0 | |
| 3253 && !autocmd_busy | |
| 3254 && curbuf->b_p_ro) | |
| 3255 { | |
| 819 | 3256 ++curbuf_lock; |
| 7 | 3257 apply_autocmds(EVENT_FILECHANGEDRO, NULL, NULL, FALSE, curbuf); |
| 819 | 3258 --curbuf_lock; |
| 7 | 3259 if (!curbuf->b_p_ro) |
| 3260 return; | |
| 3261 /* | |
| 3262 * Do what msg() does, but with a column offset if the warning should | |
| 3263 * be after the mode message. | |
| 3264 */ | |
| 3265 msg_start(); | |
| 3266 if (msg_row == Rows - 1) | |
| 3267 msg_col = col; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
3268 msg_source(HL_ATTR(HLF_W)); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
3269 MSG_PUTS_ATTR(_(w_readonly), HL_ATTR(HLF_W) | MSG_HIST); |
| 1848 | 3270 #ifdef FEAT_EVAL |
| 3271 set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1); | |
| 3272 #endif | |
| 7 | 3273 msg_clr_eos(); |
| 3274 (void)msg_end(); | |
|
10807
82c43bca568e
patch 8.0.0293: some tests have a one or three second wait
Christian Brabandt <cb@256bit.org>
parents:
10781
diff
changeset
|
3275 if (msg_silent == 0 && !silent_mode |
|
82c43bca568e
patch 8.0.0293: some tests have a one or three second wait
Christian Brabandt <cb@256bit.org>
parents:
10781
diff
changeset
|
3276 #ifdef FEAT_EVAL |
|
82c43bca568e
patch 8.0.0293: some tests have a one or three second wait
Christian Brabandt <cb@256bit.org>
parents:
10781
diff
changeset
|
3277 && time_for_testing != 1 |
|
82c43bca568e
patch 8.0.0293: some tests have a one or three second wait
Christian Brabandt <cb@256bit.org>
parents:
10781
diff
changeset
|
3278 #endif |
|
82c43bca568e
patch 8.0.0293: some tests have a one or three second wait
Christian Brabandt <cb@256bit.org>
parents:
10781
diff
changeset
|
3279 ) |
| 7 | 3280 { |
| 3281 out_flush(); | |
| 3282 ui_delay(1000L, TRUE); /* give the user time to think about it */ | |
| 3283 } | |
| 3284 curbuf->b_did_warn = TRUE; | |
| 3285 redraw_cmdline = FALSE; /* don't redraw and erase the message */ | |
| 3286 if (msg_row < Rows - 1) | |
| 3287 showmode(); | |
| 3288 } | |
| 3289 } | |
| 3290 | |
| 3291 /* | |
| 3292 * Ask for a reply from the user, a 'y' or a 'n'. | |
| 3293 * No other characters are accepted, the message is repeated until a valid | |
| 3294 * reply is entered or CTRL-C is hit. | |
| 3295 * If direct is TRUE, don't use vgetc() but ui_inchar(), don't get characters | |
| 3296 * from any buffers but directly from the user. | |
| 3297 * | |
| 3298 * return the 'y' or 'n' | |
| 3299 */ | |
| 3300 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3301 ask_yesno(char_u *str, int direct) |
| 7 | 3302 { |
| 3303 int r = ' '; | |
| 3304 int save_State = State; | |
| 3305 | |
| 3306 if (exiting) /* put terminal in raw mode for this question */ | |
| 3307 settmode(TMODE_RAW); | |
| 3308 ++no_wait_return; | |
| 3309 #ifdef USE_ON_FLY_SCROLL | |
| 3310 dont_scroll = TRUE; /* disallow scrolling here */ | |
| 3311 #endif | |
| 3312 State = CONFIRM; /* mouse behaves like with :confirm */ | |
| 3313 #ifdef FEAT_MOUSE | |
| 3314 setmouse(); /* disables mouse for xterm */ | |
| 3315 #endif | |
| 3316 ++no_mapping; | |
| 3317 ++allow_keys; /* no mapping here, but recognize keys */ | |
| 3318 | |
| 3319 while (r != 'y' && r != 'n') | |
| 3320 { | |
| 3321 /* same highlighting as for wait_return */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
3322 smsg_attr(HL_ATTR(HLF_R), (char_u *)"%s (y/n)?", str); |
| 7 | 3323 if (direct) |
| 3324 r = get_keystroke(); | |
| 3325 else | |
| 1474 | 3326 r = plain_vgetc(); |
| 7 | 3327 if (r == Ctrl_C || r == ESC) |
| 3328 r = 'n'; | |
| 3329 msg_putchar(r); /* show what you typed */ | |
| 3330 out_flush(); | |
| 3331 } | |
| 3332 --no_wait_return; | |
| 3333 State = save_State; | |
| 3334 #ifdef FEAT_MOUSE | |
| 3335 setmouse(); | |
| 3336 #endif | |
| 3337 --no_mapping; | |
| 3338 --allow_keys; | |
| 3339 | |
| 3340 return r; | |
| 3341 } | |
| 3342 | |
| 4221 | 3343 #if defined(FEAT_MOUSE) || defined(PROTO) |
| 3344 /* | |
| 3345 * Return TRUE if "c" is a mouse key. | |
| 3346 */ | |
| 3347 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3348 is_mouse_key(int c) |
| 4221 | 3349 { |
| 3350 return c == K_LEFTMOUSE | |
| 3351 || c == K_LEFTMOUSE_NM | |
| 3352 || c == K_LEFTDRAG | |
| 3353 || c == K_LEFTRELEASE | |
| 3354 || c == K_LEFTRELEASE_NM | |
|
12865
ebb4f6c93598
patch 8.0.1309: cannot use 'balloonexpr' in a terminal
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
3355 || c == K_MOUSEMOVE |
| 4221 | 3356 || c == K_MIDDLEMOUSE |
| 3357 || c == K_MIDDLEDRAG | |
| 3358 || c == K_MIDDLERELEASE | |
| 3359 || c == K_RIGHTMOUSE | |
| 3360 || c == K_RIGHTDRAG | |
| 3361 || c == K_RIGHTRELEASE | |
| 3362 || c == K_MOUSEDOWN | |
| 3363 || c == K_MOUSEUP | |
| 3364 || c == K_MOUSELEFT | |
| 3365 || c == K_MOUSERIGHT | |
| 3366 || c == K_X1MOUSE | |
| 3367 || c == K_X1DRAG | |
| 3368 || c == K_X1RELEASE | |
| 3369 || c == K_X2MOUSE | |
| 3370 || c == K_X2DRAG | |
| 3371 || c == K_X2RELEASE; | |
| 3372 } | |
| 3373 #endif | |
| 3374 | |
| 7 | 3375 /* |
| 3376 * Get a key stroke directly from the user. | |
| 3377 * Ignores mouse clicks and scrollbar events, except a click for the left | |
| 3378 * button (used at the more prompt). | |
| 3379 * Doesn't use vgetc(), because it syncs undo and eats mapped characters. | |
| 3380 * Disadvantage: typeahead is ignored. | |
| 3381 * Translates the interrupt character for unix to ESC. | |
| 3382 */ | |
| 3383 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3384 get_keystroke(void) |
| 7 | 3385 { |
| 3328 | 3386 char_u *buf = NULL; |
| 3387 int buflen = 150; | |
| 3388 int maxlen; | |
| 7 | 3389 int len = 0; |
| 3390 int n; | |
| 3391 int save_mapped_ctrl_c = mapped_ctrl_c; | |
| 964 | 3392 int waited = 0; |
| 7 | 3393 |
| 3394 mapped_ctrl_c = FALSE; /* mappings are not used here */ | |
| 3395 for (;;) | |
| 3396 { | |
| 3397 cursor_on(); | |
| 3398 out_flush(); | |
| 3399 | |
| 3328 | 3400 /* Leave some room for check_termcode() to insert a key code into (max |
| 3401 * 5 chars plus NUL). And fix_input_buffer() can triple the number of | |
| 3402 * bytes. */ | |
| 3403 maxlen = (buflen - 6 - len) / 3; | |
| 3404 if (buf == NULL) | |
| 3405 buf = alloc(buflen); | |
| 3406 else if (maxlen < 10) | |
| 3407 { | |
| 6596 | 3408 char_u *t_buf = buf; |
| 3409 | |
| 3596 | 3410 /* Need some more space. This might happen when receiving a long |
| 3328 | 3411 * escape sequence. */ |
| 3412 buflen += 100; | |
| 3413 buf = vim_realloc(buf, buflen); | |
| 6596 | 3414 if (buf == NULL) |
| 3415 vim_free(t_buf); | |
| 3328 | 3416 maxlen = (buflen - 6 - len) / 3; |
| 3417 } | |
| 3418 if (buf == NULL) | |
| 3419 { | |
| 3420 do_outofmem_msg((long_u)buflen); | |
| 3421 return ESC; /* panic! */ | |
| 3422 } | |
| 3423 | |
| 7 | 3424 /* First time: blocking wait. Second time: wait up to 100ms for a |
| 3328 | 3425 * terminal code to complete. */ |
| 3426 n = ui_inchar(buf + len, maxlen, len == 0 ? -1L : 100L, 0); | |
| 7 | 3427 if (n > 0) |
| 3428 { | |
| 3429 /* Replace zero and CSI by a special key code. */ | |
|
9896
7b39615c0db1
commit https://github.com/vim/vim/commit/6bff02eb530aa29aafa2cb5627399837be7a5dd5
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
3430 n = fix_input_buffer(buf + len, n); |
| 7 | 3431 len += n; |
| 964 | 3432 waited = 0; |
| 3433 } | |
| 3434 else if (len > 0) | |
| 3435 ++waited; /* keep track of the waiting time */ | |
| 3436 | |
| 3437 /* Incomplete termcode and not timed out yet: get more characters */ | |
| 3328 | 3438 if ((n = check_termcode(1, buf, buflen, &len)) < 0 |
| 964 | 3439 && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm))) |
| 7 | 3440 continue; |
| 964 | 3441 |
| 2672 | 3442 if (n == KEYLEN_REMOVED) /* key code removed */ |
| 2721 | 3443 { |
| 2723 | 3444 if (must_redraw != 0 && !need_wait_return && (State & CMDLINE) == 0) |
| 2721 | 3445 { |
| 3446 /* Redrawing was postponed, do it now. */ | |
| 3447 update_screen(0); | |
| 3448 setcursor(); /* put cursor back where it belongs */ | |
| 3449 } | |
| 2672 | 3450 continue; |
| 2721 | 3451 } |
| 2672 | 3452 if (n > 0) /* found a termcode: adjust length */ |
| 7 | 3453 len = n; |
| 2672 | 3454 if (len == 0) /* nothing typed yet */ |
| 7 | 3455 continue; |
| 3456 | |
| 3457 /* Handle modifier and/or special key code. */ | |
| 3458 n = buf[0]; | |
| 3459 if (n == K_SPECIAL) | |
| 3460 { | |
| 3461 n = TO_SPECIAL(buf[1], buf[2]); | |
| 3462 if (buf[1] == KS_MODIFIER | |
| 3463 || n == K_IGNORE | |
| 4225 | 3464 #ifdef FEAT_MOUSE |
| 4221 | 3465 || (is_mouse_key(n) && n != K_LEFTMOUSE) |
| 4225 | 3466 #endif |
| 4221 | 3467 #ifdef FEAT_GUI |
| 7 | 3468 || n == K_VER_SCROLLBAR |
| 3469 || n == K_HOR_SCROLLBAR | |
| 3470 #endif | |
| 3471 ) | |
| 3472 { | |
| 3473 if (buf[1] == KS_MODIFIER) | |
| 3474 mod_mask = buf[2]; | |
| 3475 len -= 3; | |
| 3476 if (len > 0) | |
| 3477 mch_memmove(buf, buf + 3, (size_t)len); | |
| 3478 continue; | |
| 3479 } | |
| 828 | 3480 break; |
| 7 | 3481 } |
| 3482 #ifdef FEAT_MBYTE | |
| 3483 if (has_mbyte) | |
| 3484 { | |
| 3485 if (MB_BYTE2LEN(n) > len) | |
| 3486 continue; /* more bytes to get */ | |
| 3328 | 3487 buf[len >= buflen ? buflen - 1 : len] = NUL; |
| 7 | 3488 n = (*mb_ptr2char)(buf); |
| 3489 } | |
| 3490 #endif | |
| 3491 #ifdef UNIX | |
| 3492 if (n == intr_char) | |
| 3493 n = ESC; | |
| 3494 #endif | |
| 3495 break; | |
| 3496 } | |
| 3328 | 3497 vim_free(buf); |
| 7 | 3498 |
| 3499 mapped_ctrl_c = save_mapped_ctrl_c; | |
| 3500 return n; | |
| 3501 } | |
| 3502 | |
| 3503 /* | |
| 374 | 3504 * Get a number from the user. |
| 3505 * When "mouse_used" is not NULL allow using the mouse. | |
| 7 | 3506 */ |
| 3507 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3508 get_number( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3509 int colon, /* allow colon to abort */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3510 int *mouse_used) |
| 7 | 3511 { |
| 3512 int n = 0; | |
| 3513 int c; | |
| 810 | 3514 int typed = 0; |
| 7 | 3515 |
| 374 | 3516 if (mouse_used != NULL) |
| 3517 *mouse_used = FALSE; | |
| 3518 | |
| 7 | 3519 /* When not printing messages, the user won't know what to type, return a |
| 3520 * zero (as if CR was hit). */ | |
| 3521 if (msg_silent != 0) | |
| 3522 return 0; | |
| 3523 | |
| 3524 #ifdef USE_ON_FLY_SCROLL | |
| 3525 dont_scroll = TRUE; /* disallow scrolling here */ | |
| 3526 #endif | |
| 3527 ++no_mapping; | |
| 3528 ++allow_keys; /* no mapping here, but recognize keys */ | |
| 3529 for (;;) | |
| 3530 { | |
| 3531 windgoto(msg_row, msg_col); | |
| 3532 c = safe_vgetc(); | |
| 3533 if (VIM_ISDIGIT(c)) | |
| 3534 { | |
| 3535 n = n * 10 + c - '0'; | |
| 3536 msg_putchar(c); | |
| 810 | 3537 ++typed; |
| 7 | 3538 } |
| 3539 else if (c == K_DEL || c == K_KDEL || c == K_BS || c == Ctrl_H) | |
| 3540 { | |
| 810 | 3541 if (typed > 0) |
| 3542 { | |
| 3543 MSG_PUTS("\b \b"); | |
| 3544 --typed; | |
| 3545 } | |
| 7 | 3546 n /= 10; |
| 3547 } | |
| 374 | 3548 #ifdef FEAT_MOUSE |
| 3549 else if (mouse_used != NULL && c == K_LEFTMOUSE) | |
| 3550 { | |
| 3551 *mouse_used = TRUE; | |
| 3552 n = mouse_row + 1; | |
| 3553 break; | |
| 3554 } | |
| 3555 #endif | |
| 7 | 3556 else if (n == 0 && c == ':' && colon) |
| 3557 { | |
| 3558 stuffcharReadbuff(':'); | |
| 3559 if (!exmode_active) | |
| 3560 cmdline_row = msg_row; | |
| 3561 skip_redraw = TRUE; /* skip redraw once */ | |
| 3562 do_redraw = FALSE; | |
| 3563 break; | |
| 3564 } | |
| 3565 else if (c == CAR || c == NL || c == Ctrl_C || c == ESC) | |
| 3566 break; | |
| 3567 } | |
| 3568 --no_mapping; | |
| 3569 --allow_keys; | |
| 3570 return n; | |
| 3571 } | |
| 3572 | |
| 323 | 3573 /* |
| 3574 * Ask the user to enter a number. | |
| 374 | 3575 * When "mouse_used" is not NULL allow using the mouse and in that case return |
| 3576 * the line number. | |
| 323 | 3577 */ |
| 3578 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3579 prompt_for_number(int *mouse_used) |
| 323 | 3580 { |
| 3581 int i; | |
| 344 | 3582 int save_cmdline_row; |
| 3583 int save_State; | |
| 323 | 3584 |
| 3585 /* When using ":silent" assume that <CR> was entered. */ | |
| 375 | 3586 if (mouse_used != NULL) |
| 1733 | 3587 MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): ")); |
| 375 | 3588 else |
| 1733 | 3589 MSG_PUTS(_("Type number and <Enter> (empty cancels): ")); |
| 344 | 3590 |
| 957 | 3591 /* Set the state such that text can be selected/copied/pasted and we still |
| 3592 * get mouse events. */ | |
| 344 | 3593 save_cmdline_row = cmdline_row; |
| 957 | 3594 cmdline_row = 0; |
| 344 | 3595 save_State = State; |
|
11678
6bbc7bc0f3dd
patch 8.0.0722: screen is messed by timer up at inputlist() prompt
Christian Brabandt <cb@256bit.org>
parents:
11601
diff
changeset
|
3596 State = ASKMORE; /* prevents a screen update when using a timer */ |
|
13768
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3597 #ifdef FEAT_MOUSE |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3598 /* May show different mouse shape. */ |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3599 setmouse(); |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3600 #endif |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3601 |
| 374 | 3602 |
| 3603 i = get_number(TRUE, mouse_used); | |
| 3604 if (KeyTyped) | |
| 3605 { | |
| 3606 /* don't call wait_return() now */ | |
| 3607 /* msg_putchar('\n'); */ | |
| 323 | 3608 cmdline_row = msg_row - 1; |
| 3609 need_wait_return = FALSE; | |
| 3610 msg_didany = FALSE; | |
| 1938 | 3611 msg_didout = FALSE; |
| 323 | 3612 } |
| 344 | 3613 else |
| 3614 cmdline_row = save_cmdline_row; | |
| 3615 State = save_State; | |
|
13768
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3616 #ifdef FEAT_MOUSE |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3617 /* May need to restore mouse shape. */ |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3618 setmouse(); |
|
bcef80912112
patch 8.0.1756: GUI: after prompting for a number the mouse shape is wrong
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
3619 #endif |
| 344 | 3620 |
| 323 | 3621 return i; |
| 3622 } | |
| 3623 | |
| 7 | 3624 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3625 msgmore(long n) |
| 7 | 3626 { |
| 3627 long pn; | |
| 3628 | |
| 3629 if (global_busy /* no messages now, wait until global is finished */ | |
| 3630 || !messaging()) /* 'lazyredraw' set, don't do messages now */ | |
| 3631 return; | |
| 3632 | |
| 135 | 3633 /* We don't want to overwrite another important message, but do overwrite |
| 3634 * a previous "more lines" or "fewer lines" message, so that "5dd" and | |
| 3635 * then "put" reports the last action. */ | |
| 3636 if (keep_msg != NULL && !keep_msg_more) | |
| 3637 return; | |
| 3638 | |
| 7 | 3639 if (n > 0) |
| 3640 pn = n; | |
| 3641 else | |
| 3642 pn = -n; | |
| 3643 | |
| 3644 if (pn > p_report) | |
| 3645 { | |
| 3646 if (pn == 1) | |
| 3647 { | |
| 3648 if (n > 0) | |
| 2768 | 3649 vim_strncpy(msg_buf, (char_u *)_("1 more line"), |
| 3650 MSG_BUF_LEN - 1); | |
| 7 | 3651 else |
| 2768 | 3652 vim_strncpy(msg_buf, (char_u *)_("1 line less"), |
| 3653 MSG_BUF_LEN - 1); | |
| 7 | 3654 } |
| 3655 else | |
| 3656 { | |
| 3657 if (n > 0) | |
| 2768 | 3658 vim_snprintf((char *)msg_buf, MSG_BUF_LEN, |
| 3659 _("%ld more lines"), pn); | |
| 7 | 3660 else |
| 2768 | 3661 vim_snprintf((char *)msg_buf, MSG_BUF_LEN, |
| 3662 _("%ld fewer lines"), pn); | |
| 7 | 3663 } |
| 3664 if (got_int) | |
| 2768 | 3665 vim_strcat(msg_buf, (char_u *)_(" (Interrupted)"), MSG_BUF_LEN); |
| 7 | 3666 if (msg(msg_buf)) |
| 3667 { | |
| 680 | 3668 set_keep_msg(msg_buf, 0); |
| 135 | 3669 keep_msg_more = TRUE; |
| 7 | 3670 } |
| 3671 } | |
| 3672 } | |
| 3673 | |
| 3674 /* | |
| 3675 * flush map and typeahead buffers and give a warning for an error | |
| 3676 */ | |
| 3677 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3678 beep_flush(void) |
| 7 | 3679 { |
| 3680 if (emsg_silent == 0) | |
| 3681 { | |
| 3682 flush_buffers(FALSE); | |
| 6949 | 3683 vim_beep(BO_ERROR); |
| 3684 } | |
| 3685 } | |
| 3686 | |
| 3687 /* | |
| 3688 * Give a warning for an error. | |
| 7 | 3689 */ |
| 3690 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3691 vim_beep( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3692 unsigned val) /* one of the BO_ values, e.g., BO_OPER */ |
| 7 | 3693 { |
|
13272
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3694 #ifdef FEAT_EVAL |
|
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3695 called_vim_beep = TRUE; |
|
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3696 #endif |
|
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3697 |
| 7 | 3698 if (emsg_silent == 0) |
| 3699 { | |
| 6949 | 3700 if (!((bo_flags & val) || (bo_flags & BO_ALL))) |
| 3701 { | |
|
11601
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3702 #ifdef ELAPSED_FUNC |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3703 static int did_init = FALSE; |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3704 static ELAPSED_TYPE start_tv; |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3705 |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3706 /* Only beep once per half a second, otherwise a sequence of beeps |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3707 * would freeze Vim. */ |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3708 if (!did_init || ELAPSED_FUNC(start_tv) > 500) |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3709 { |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3710 did_init = TRUE; |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3711 ELAPSED_INIT(start_tv); |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3712 #endif |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3713 if (p_vb |
| 7 | 3714 #ifdef FEAT_GUI |
|
11601
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3715 /* While the GUI is starting up the termcap is set for |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3716 * the GUI but the output still goes to a terminal. */ |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3717 && !(gui.in_use && gui.starting) |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3718 #endif |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3719 ) |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3720 { |
|
11601
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3721 out_str_cf(T_VB); |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3722 #ifdef FEAT_VTP |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3723 /* No restore color information, refresh the screen. */ |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3724 if (has_vtp_working() != 0 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3725 # ifdef FEAT_TERMGUICOLORS |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3726 && p_tgc |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3727 # endif |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3728 ) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3729 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3730 redraw_later(CLEAR); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3731 update_screen(0); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3732 redrawcmd(); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3733 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3734 #endif |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13272
diff
changeset
|
3735 } |
|
11601
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3736 else |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3737 out_char(BELL); |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3738 #ifdef ELAPSED_FUNC |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3739 } |
|
0a5d405e2520
patch 8.0.0683: visual bell flashes too quickly
Christian Brabandt <cb@256bit.org>
parents:
11384
diff
changeset
|
3740 #endif |
| 7 | 3741 } |
| 169 | 3742 |
|
13272
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3743 /* When 'debug' contains "beep" produce a message. If we are sourcing |
|
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3744 * a script or executing a function give the user a hint where the beep |
|
abaebba89fd4
patch 8.0.1510: cannot test if a command causes a beep
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
3745 * comes from. */ |
| 169 | 3746 if (vim_strchr(p_debug, 'e') != NULL) |
| 3747 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
3748 msg_source(HL_ATTR(HLF_W)); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
3749 msg_attr((char_u *)_("Beep!"), HL_ATTR(HLF_W)); |
| 169 | 3750 } |
| 7 | 3751 } |
| 3752 } | |
| 3753 | |
| 3754 /* | |
| 3755 * To get the "real" home directory: | |
| 3756 * - get value of $HOME | |
| 3757 * For Unix: | |
| 3758 * - go to that directory | |
| 3759 * - do mch_dirname() to get the real name of that directory. | |
| 3760 * This also works with mounts and links. | |
| 3761 * Don't do this for MS-DOS, it will change the "current dir" for a drive. | |
| 3762 */ | |
| 3763 static char_u *homedir = NULL; | |
| 3764 | |
| 3765 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3766 init_homedir(void) |
| 7 | 3767 { |
| 3768 char_u *var; | |
| 3769 | |
| 170 | 3770 /* In case we are called a second time (when 'encoding' changes). */ |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13188
diff
changeset
|
3771 VIM_CLEAR(homedir); |
| 170 | 3772 |
| 7 | 3773 #ifdef VMS |
| 3774 var = mch_getenv((char_u *)"SYS$LOGIN"); | |
| 3775 #else | |
| 3776 var = mch_getenv((char_u *)"HOME"); | |
| 3777 #endif | |
| 3778 | |
| 3779 #ifdef WIN3264 | |
| 3780 /* | |
|
12265
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3781 * Typically, $HOME is not defined on Windows, unless the user has |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3782 * specifically defined it for Vim's sake. However, on Windows NT |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3783 * platforms, $HOMEDRIVE and $HOMEPATH are automatically defined for |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3784 * each user. Try constructing $HOME from these. |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3785 */ |
|
12269
d2373927d76d
patch 8.0.1014: old compiler doesn't know uint32_t
Christian Brabandt <cb@256bit.org>
parents:
12265
diff
changeset
|
3786 if (var == NULL || *var == NUL) |
|
12265
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3787 { |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3788 char_u *homedrive, *homepath; |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3789 |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3790 homedrive = mch_getenv((char_u *)"HOMEDRIVE"); |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3791 homepath = mch_getenv((char_u *)"HOMEPATH"); |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3792 if (homepath == NULL || *homepath == NUL) |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3793 homepath = (char_u *)"\\"; |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3794 if (homedrive != NULL |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3795 && STRLEN(homedrive) + STRLEN(homepath) < MAXPATHL) |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3796 { |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3797 sprintf((char *)NameBuff, "%s%s", homedrive, homepath); |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3798 if (NameBuff[0] != NUL) |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3799 var = NameBuff; |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3800 } |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3801 } |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3802 |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3803 if (var == NULL) |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3804 var = mch_getenv((char_u *)"USERPROFILE"); |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3805 |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3806 /* |
| 7 | 3807 * Weird but true: $HOME may contain an indirect reference to another |
| 3808 * variable, esp. "%USERPROFILE%". Happens when $USERPROFILE isn't set | |
| 3809 * when $HOME is being set. | |
| 3810 */ | |
| 3811 if (var != NULL && *var == '%') | |
| 3812 { | |
| 3813 char_u *p; | |
| 3814 char_u *exp; | |
| 3815 | |
| 3816 p = vim_strchr(var + 1, '%'); | |
| 3817 if (p != NULL) | |
| 3818 { | |
| 419 | 3819 vim_strncpy(NameBuff, var + 1, p - (var + 1)); |
| 7 | 3820 exp = mch_getenv(NameBuff); |
| 3821 if (exp != NULL && *exp != NUL | |
| 3822 && STRLEN(exp) + STRLEN(p) < MAXPATHL) | |
| 3823 { | |
| 274 | 3824 vim_snprintf((char *)NameBuff, MAXPATHL, "%s%s", exp, p + 1); |
| 7 | 3825 var = NameBuff; |
|
12265
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3826 } |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3827 } |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3828 } |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3829 |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3830 if (var != NULL && *var == NUL) /* empty is same as not set */ |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3831 var = NULL; |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3832 |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3833 # ifdef FEAT_MBYTE |
| 170 | 3834 if (enc_utf8 && var != NULL) |
| 3835 { | |
| 3836 int len; | |
| 2786 | 3837 char_u *pp = NULL; |
| 170 | 3838 |
| 3839 /* Convert from active codepage to UTF-8. Other conversions are | |
| 3840 * not done, because they would fail for non-ASCII characters. */ | |
| 835 | 3841 acp_to_enc(var, (int)STRLEN(var), &pp, &len); |
| 170 | 3842 if (pp != NULL) |
| 3843 { | |
| 3844 homedir = pp; | |
| 3845 return; | |
| 3846 } | |
| 3847 } | |
| 3848 # endif | |
|
12265
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3849 |
| 7 | 3850 /* |
| 3851 * Default home dir is C:/ | |
| 3852 * Best assumption we can make in such a situation. | |
| 3853 */ | |
| 3854 if (var == NULL) | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
3855 var = (char_u *)"C:/"; |
| 7 | 3856 #endif |
|
12265
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
3857 |
| 7 | 3858 if (var != NULL) |
| 3859 { | |
| 3860 #ifdef UNIX | |
| 3861 /* | |
| 3862 * Change to the directory and get the actual path. This resolves | |
| 3863 * links. Don't do it when we can't return. | |
| 3864 */ | |
| 3865 if (mch_dirname(NameBuff, MAXPATHL) == OK | |
| 3866 && mch_chdir((char *)NameBuff) == 0) | |
| 3867 { | |
| 3868 if (!mch_chdir((char *)var) && mch_dirname(IObuff, IOSIZE) == OK) | |
| 3869 var = IObuff; | |
| 3870 if (mch_chdir((char *)NameBuff) != 0) | |
| 3871 EMSG(_(e_prev_dir)); | |
| 3872 } | |
| 3873 #endif | |
| 3874 homedir = vim_strsave(var); | |
| 3875 } | |
| 3876 } | |
| 3877 | |
| 359 | 3878 #if defined(EXITFREE) || defined(PROTO) |
| 3879 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3880 free_homedir(void) |
| 359 | 3881 { |
| 3882 vim_free(homedir); | |
| 3883 } | |
| 3744 | 3884 |
| 3885 # ifdef FEAT_CMDL_COMPL | |
| 3886 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3887 free_users(void) |
| 3744 | 3888 { |
| 3889 ga_clear_strings(&ga_users); | |
| 3890 } | |
| 3891 # endif | |
| 359 | 3892 #endif |
| 3893 | |
| 7 | 3894 /* |
| 1408 | 3895 * Call expand_env() and store the result in an allocated string. |
| 3896 * This is not very memory efficient, this expects the result to be freed | |
| 3897 * again soon. | |
| 3898 */ | |
| 3899 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3900 expand_env_save(char_u *src) |
| 1408 | 3901 { |
| 3902 return expand_env_save_opt(src, FALSE); | |
| 3903 } | |
| 3904 | |
| 3905 /* | |
| 3906 * Idem, but when "one" is TRUE handle the string as one file name, only | |
| 3907 * expand "~" at the start. | |
| 3908 */ | |
| 3909 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3910 expand_env_save_opt(char_u *src, int one) |
| 1408 | 3911 { |
| 3912 char_u *p; | |
| 3913 | |
| 3914 p = alloc(MAXPATHL); | |
| 3915 if (p != NULL) | |
| 3916 expand_env_esc(src, p, MAXPATHL, FALSE, one, NULL); | |
| 3917 return p; | |
| 3918 } | |
| 3919 | |
| 3920 /* | |
| 7 | 3921 * Expand environment variable with path name. |
| 3922 * "~/" is also expanded, using $HOME. For Unix "~user/" is expanded. | |
| 1408 | 3923 * Skips over "\ ", "\~" and "\$" (not for Win32 though). |
| 7 | 3924 * If anything fails no expansion is done and dst equals src. |
| 3925 */ | |
| 3926 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3927 expand_env( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3928 char_u *src, /* input string e.g. "$HOME/vim.hlp" */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3929 char_u *dst, /* where to put the result */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3930 int dstlen) /* maximum length of the result */ |
| 7 | 3931 { |
| 1408 | 3932 expand_env_esc(src, dst, dstlen, FALSE, FALSE, NULL); |
| 7 | 3933 } |
| 3934 | |
| 3935 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3936 expand_env_esc( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3937 char_u *srcp, /* input string e.g. "$HOME/vim.hlp" */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3938 char_u *dst, /* where to put the result */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3939 int dstlen, /* maximum length of the result */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3940 int esc, /* escape spaces in expanded variables */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3941 int one, /* "srcp" is one file name */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
3942 char_u *startstr) /* start again after this (can be NULL) */ |
| 374 | 3943 { |
| 3944 char_u *src; | |
| 7 | 3945 char_u *tail; |
| 3946 int c; | |
| 3947 char_u *var; | |
| 3948 int copy_char; | |
| 3949 int mustfree; /* var was allocated, need to free it later */ | |
| 3950 int at_start = TRUE; /* at start of a name */ | |
| 374 | 3951 int startstr_len = 0; |
| 3952 | |
| 3953 if (startstr != NULL) | |
| 835 | 3954 startstr_len = (int)STRLEN(startstr); |
| 374 | 3955 |
| 3956 src = skipwhite(srcp); | |
| 7 | 3957 --dstlen; /* leave one char space for "\," */ |
| 3958 while (*src && dstlen > 0) | |
| 3959 { | |
|
7038
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3960 #ifdef FEAT_EVAL |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3961 /* Skip over `=expr`. */ |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3962 if (src[0] == '`' && src[1] == '=') |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3963 { |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3964 size_t len; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3965 |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3966 var = src; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3967 src += 2; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3968 (void)skip_expr(&src); |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3969 if (*src == '`') |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3970 ++src; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3971 len = src - var; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3972 if (len > (size_t)dstlen) |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3973 len = dstlen; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3974 vim_strncpy(dst, var, len); |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3975 dst += len; |
|
7066
094c8ccdc279
commit https://github.com/vim/vim/commit/5df1ed2de3fa9dcace996b9a0a4c9b3cea79cf1e
Christian Brabandt <cb@256bit.org>
parents:
7038
diff
changeset
|
3976 dstlen -= (int)len; |
|
7038
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3977 continue; |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3978 } |
|
76042a56ab85
commit https://github.com/vim/vim/commit/be83b73ddb2ee8297037166d243f72e3423a3ce3
Christian Brabandt <cb@256bit.org>
parents:
7036
diff
changeset
|
3979 #endif |
| 7 | 3980 copy_char = TRUE; |
| 22 | 3981 if ((*src == '$' |
| 3982 #ifdef VMS | |
| 3983 && at_start | |
| 3984 #endif | |
| 3985 ) | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
3986 #if defined(MSWIN) |
| 7 | 3987 || *src == '%' |
| 3988 #endif | |
| 3989 || (*src == '~' && at_start)) | |
| 3990 { | |
| 3991 mustfree = FALSE; | |
| 3992 | |
| 3993 /* | |
| 3994 * The variable name is copied into dst temporarily, because it may | |
| 3995 * be a string in read-only memory and a NUL needs to be appended. | |
| 3996 */ | |
| 3997 if (*src != '~') /* environment var */ | |
| 3998 { | |
| 3999 tail = src + 1; | |
| 4000 var = dst; | |
| 4001 c = dstlen - 1; | |
| 4002 | |
| 4003 #ifdef UNIX | |
| 4004 /* Unix has ${var-name} type environment vars */ | |
| 4005 if (*tail == '{' && !vim_isIDc('{')) | |
| 4006 { | |
| 4007 tail++; /* ignore '{' */ | |
| 4008 while (c-- > 0 && *tail && *tail != '}') | |
| 4009 *var++ = *tail++; | |
| 4010 } | |
| 4011 else | |
| 4012 #endif | |
| 4013 { | |
| 4014 while (c-- > 0 && *tail != NUL && ((vim_isIDc(*tail)) | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
4015 #if defined(MSWIN) |
| 7 | 4016 || (*src == '%' && *tail != '%') |
| 4017 #endif | |
| 4018 )) | |
| 4019 { | |
| 4020 *var++ = *tail++; | |
| 4021 } | |
| 4022 } | |
| 4023 | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
4024 #if defined(MSWIN) || defined(UNIX) |
| 7 | 4025 # ifdef UNIX |
| 4026 if (src[1] == '{' && *tail != '}') | |
| 4027 # else | |
| 4028 if (*src == '%' && *tail != '%') | |
| 4029 # endif | |
| 4030 var = NULL; | |
| 4031 else | |
| 4032 { | |
| 4033 # ifdef UNIX | |
| 4034 if (src[1] == '{') | |
| 4035 # else | |
| 4036 if (*src == '%') | |
| 4037 #endif | |
| 4038 ++tail; | |
| 4039 #endif | |
| 4040 *var = NUL; | |
| 4041 var = vim_getenv(dst, &mustfree); | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
4042 #if defined(MSWIN) || defined(UNIX) |
| 7 | 4043 } |
| 4044 #endif | |
| 4045 } | |
| 4046 /* home directory */ | |
| 4047 else if ( src[1] == NUL | |
| 4048 || vim_ispathsep(src[1]) | |
| 4049 || vim_strchr((char_u *)" ,\t\n", src[1]) != NULL) | |
| 4050 { | |
| 4051 var = homedir; | |
| 4052 tail = src + 1; | |
| 4053 } | |
| 4054 else /* user directory */ | |
| 4055 { | |
| 4056 #if defined(UNIX) || (defined(VMS) && defined(USER_HOME)) | |
| 4057 /* | |
| 4058 * Copy ~user to dst[], so we can put a NUL after it. | |
| 4059 */ | |
| 4060 tail = src; | |
| 4061 var = dst; | |
| 4062 c = dstlen - 1; | |
| 4063 while ( c-- > 0 | |
| 4064 && *tail | |
| 4065 && vim_isfilec(*tail) | |
| 4066 && !vim_ispathsep(*tail)) | |
| 4067 *var++ = *tail++; | |
| 4068 *var = NUL; | |
| 4069 # ifdef UNIX | |
| 4070 /* | |
| 4071 * If the system supports getpwnam(), use it. | |
| 4072 * Otherwise, or if getpwnam() fails, the shell is used to | |
| 4073 * expand ~user. This is slower and may fail if the shell | |
| 4074 * does not support ~user (old versions of /bin/sh). | |
| 4075 */ | |
| 4076 # if defined(HAVE_GETPWNAM) && defined(HAVE_PWD_H) | |
| 4077 { | |
| 626 | 4078 /* Note: memory allocated by getpwnam() is never freed. |
| 4079 * Calling endpwent() apparently doesn't help. */ | |
|
10932
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4080 struct passwd *pw = (*dst == NUL) |
|
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4081 ? NULL : getpwnam((char *)dst + 1); |
|
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4082 |
|
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
4083 var = (pw == NULL) ? NULL : (char_u *)pw->pw_dir; |
| 7 | 4084 } |
| 4085 if (var == NULL) | |
| 4086 # endif | |
| 4087 { | |
| 4088 expand_T xpc; | |
| 4089 | |
| 4090 ExpandInit(&xpc); | |
| 4091 xpc.xp_context = EXPAND_FILES; | |
| 4092 var = ExpandOne(&xpc, dst, NULL, | |
| 4093 WILD_ADD_SLASH|WILD_SILENT, WILD_EXPAND_FREE); | |
| 4094 mustfree = TRUE; | |
| 4095 } | |
| 4096 | |
| 4097 # else /* !UNIX, thus VMS */ | |
| 4098 /* | |
| 4099 * USER_HOME is a comma-separated list of | |
| 4100 * directories to search for the user account in. | |
| 4101 */ | |
| 4102 { | |
| 4103 char_u test[MAXPATHL], paths[MAXPATHL]; | |
| 4104 char_u *path, *next_path, *ptr; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4105 stat_T st; |
| 7 | 4106 |
| 4107 STRCPY(paths, USER_HOME); | |
| 4108 next_path = paths; | |
| 4109 while (*next_path) | |
| 4110 { | |
| 4111 for (path = next_path; *next_path && *next_path != ','; | |
| 4112 next_path++); | |
| 4113 if (*next_path) | |
| 4114 *next_path++ = NUL; | |
| 4115 STRCPY(test, path); | |
| 4116 STRCAT(test, "/"); | |
| 4117 STRCAT(test, dst + 1); | |
| 4118 if (mch_stat(test, &st) == 0) | |
| 4119 { | |
| 4120 var = alloc(STRLEN(test) + 1); | |
| 4121 STRCPY(var, test); | |
| 4122 mustfree = TRUE; | |
| 4123 break; | |
| 4124 } | |
| 4125 } | |
| 4126 } | |
| 4127 # endif /* UNIX */ | |
| 4128 #else | |
| 4129 /* cannot expand user's home directory, so don't try */ | |
| 4130 var = NULL; | |
| 4131 tail = (char_u *)""; /* for gcc */ | |
| 4132 #endif /* UNIX || VMS */ | |
| 4133 } | |
| 4134 | |
| 4135 #ifdef BACKSLASH_IN_FILENAME | |
| 4136 /* If 'shellslash' is set change backslashes to forward slashes. | |
| 4137 * Can't use slash_adjust(), p_ssl may be set temporarily. */ | |
| 4138 if (p_ssl && var != NULL && vim_strchr(var, '\\') != NULL) | |
| 4139 { | |
| 4140 char_u *p = vim_strsave(var); | |
| 4141 | |
| 4142 if (p != NULL) | |
| 4143 { | |
| 4144 if (mustfree) | |
| 4145 vim_free(var); | |
| 4146 var = p; | |
| 4147 mustfree = TRUE; | |
| 4148 forward_slash(var); | |
| 4149 } | |
| 4150 } | |
| 4151 #endif | |
| 4152 | |
| 4153 /* If "var" contains white space, escape it with a backslash. | |
| 4154 * Required for ":e ~/tt" when $HOME includes a space. */ | |
| 4155 if (esc && var != NULL && vim_strpbrk(var, (char_u *)" \t") != NULL) | |
| 4156 { | |
| 4157 char_u *p = vim_strsave_escaped(var, (char_u *)" \t"); | |
| 4158 | |
| 4159 if (p != NULL) | |
| 4160 { | |
| 4161 if (mustfree) | |
| 4162 vim_free(var); | |
| 4163 var = p; | |
| 4164 mustfree = TRUE; | |
| 4165 } | |
| 4166 } | |
| 4167 | |
| 4168 if (var != NULL && *var != NUL | |
| 4169 && (STRLEN(var) + STRLEN(tail) + 1 < (unsigned)dstlen)) | |
| 4170 { | |
| 4171 STRCPY(dst, var); | |
| 4172 dstlen -= (int)STRLEN(var); | |
| 835 | 4173 c = (int)STRLEN(var); |
| 7 | 4174 /* if var[] ends in a path separator and tail[] starts |
| 4175 * with it, skip a character */ | |
| 39 | 4176 if (*var != NUL && after_pathsep(dst, dst + c) |
| 7 | 4177 #if defined(BACKSLASH_IN_FILENAME) || defined(AMIGA) |
| 4178 && dst[-1] != ':' | |
| 4179 #endif | |
| 4180 && vim_ispathsep(*tail)) | |
| 4181 ++tail; | |
| 39 | 4182 dst += c; |
| 7 | 4183 src = tail; |
| 4184 copy_char = FALSE; | |
| 4185 } | |
| 4186 if (mustfree) | |
| 4187 vim_free(var); | |
| 4188 } | |
| 4189 | |
| 4190 if (copy_char) /* copy at least one char */ | |
| 4191 { | |
| 4192 /* | |
| 1224 | 4193 * Recognize the start of a new name, for '~'. |
| 1408 | 4194 * Don't do this when "one" is TRUE, to avoid expanding "~" in |
| 4195 * ":edit foo ~ foo". | |
| 7 | 4196 */ |
| 4197 at_start = FALSE; | |
| 4198 if (src[0] == '\\' && src[1] != NUL) | |
| 4199 { | |
| 4200 *dst++ = *src++; | |
| 4201 --dstlen; | |
| 4202 } | |
| 1408 | 4203 else if ((src[0] == ' ' || src[0] == ',') && !one) |
| 7 | 4204 at_start = TRUE; |
|
12005
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4205 if (dstlen > 0) |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4206 { |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4207 *dst++ = *src++; |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4208 --dstlen; |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4209 |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4210 if (startstr != NULL && src - startstr_len >= srcp |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4211 && STRNCMP(src - startstr_len, startstr, |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4212 startstr_len) == 0) |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4213 at_start = TRUE; |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4214 } |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4215 } |
|
0496ea4c5c2e
patch 8.0.0883: invalid memory access with nonsensical script
Christian Brabandt <cb@256bit.org>
parents:
11989
diff
changeset
|
4216 |
| 7 | 4217 } |
| 4218 *dst = NUL; | |
| 4219 } | |
| 4220 | |
| 4221 /* | |
| 4222 * Vim's version of getenv(). | |
| 4223 * Special handling of $HOME, $VIM and $VIMRUNTIME. | |
| 196 | 4224 * Also does ACP to 'enc' conversion for Win32. |
| 2786 | 4225 * "mustfree" is set to TRUE when returned is allocated, it must be |
| 4226 * initialized to FALSE by the caller. | |
| 7 | 4227 */ |
| 4228 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4229 vim_getenv(char_u *name, int *mustfree) |
| 7 | 4230 { |
| 4231 char_u *p; | |
| 4232 char_u *pend; | |
| 4233 int vimruntime; | |
| 4234 | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
4235 #if defined(MSWIN) |
| 7 | 4236 /* use "C:/" when $HOME is not set */ |
| 4237 if (STRCMP(name, "HOME") == 0) | |
| 4238 return homedir; | |
| 4239 #endif | |
| 4240 | |
| 4241 p = mch_getenv(name); | |
| 4242 if (p != NULL && *p == NUL) /* empty is the same as not set */ | |
| 4243 p = NULL; | |
| 4244 | |
| 4245 if (p != NULL) | |
| 170 | 4246 { |
| 4247 #if defined(FEAT_MBYTE) && defined(WIN3264) | |
| 4248 if (enc_utf8) | |
| 4249 { | |
| 4250 int len; | |
| 2786 | 4251 char_u *pp = NULL; |
| 170 | 4252 |
| 4253 /* Convert from active codepage to UTF-8. Other conversions are | |
| 4254 * not done, because they would fail for non-ASCII characters. */ | |
| 835 | 4255 acp_to_enc(p, (int)STRLEN(p), &pp, &len); |
| 170 | 4256 if (pp != NULL) |
| 4257 { | |
| 4258 p = pp; | |
| 4259 *mustfree = TRUE; | |
| 4260 } | |
| 4261 } | |
| 4262 #endif | |
| 7 | 4263 return p; |
| 170 | 4264 } |
| 7 | 4265 |
| 4266 vimruntime = (STRCMP(name, "VIMRUNTIME") == 0); | |
| 4267 if (!vimruntime && STRCMP(name, "VIM") != 0) | |
| 4268 return NULL; | |
| 4269 | |
| 4270 /* | |
| 4271 * When expanding $VIMRUNTIME fails, try using $VIM/vim<version> or $VIM. | |
| 4272 * Don't do this when default_vimruntime_dir is non-empty. | |
| 4273 */ | |
| 4274 if (vimruntime | |
| 4275 #ifdef HAVE_PATHDEF | |
| 4276 && *default_vimruntime_dir == NUL | |
| 4277 #endif | |
| 4278 ) | |
| 4279 { | |
| 4280 p = mch_getenv((char_u *)"VIM"); | |
| 4281 if (p != NULL && *p == NUL) /* empty is the same as not set */ | |
| 4282 p = NULL; | |
| 4283 if (p != NULL) | |
| 4284 { | |
| 4285 p = vim_version_dir(p); | |
| 4286 if (p != NULL) | |
| 4287 *mustfree = TRUE; | |
| 4288 else | |
| 4289 p = mch_getenv((char_u *)"VIM"); | |
| 170 | 4290 |
| 4291 #if defined(FEAT_MBYTE) && defined(WIN3264) | |
| 4292 if (enc_utf8) | |
| 4293 { | |
| 4294 int len; | |
| 2786 | 4295 char_u *pp = NULL; |
| 170 | 4296 |
| 4297 /* Convert from active codepage to UTF-8. Other conversions | |
| 4298 * are not done, because they would fail for non-ASCII | |
| 4299 * characters. */ | |
| 835 | 4300 acp_to_enc(p, (int)STRLEN(p), &pp, &len); |
| 170 | 4301 if (pp != NULL) |
| 4302 { | |
| 2786 | 4303 if (*mustfree) |
| 170 | 4304 vim_free(p); |
| 4305 p = pp; | |
| 4306 *mustfree = TRUE; | |
| 4307 } | |
| 4308 } | |
| 4309 #endif | |
| 7 | 4310 } |
| 4311 } | |
| 4312 | |
| 4313 /* | |
| 4314 * When expanding $VIM or $VIMRUNTIME fails, try using: | |
| 4315 * - the directory name from 'helpfile' (unless it contains '$') | |
| 4316 * - the executable name from argv[0] | |
| 4317 */ | |
| 4318 if (p == NULL) | |
| 4319 { | |
| 4320 if (p_hf != NULL && vim_strchr(p_hf, '$') == NULL) | |
| 4321 p = p_hf; | |
| 4322 #ifdef USE_EXE_NAME | |
| 4323 /* | |
| 4324 * Use the name of the executable, obtained from argv[0]. | |
| 4325 */ | |
| 4326 else | |
| 4327 p = exe_name; | |
| 4328 #endif | |
| 4329 if (p != NULL) | |
| 4330 { | |
| 4331 /* remove the file name */ | |
| 4332 pend = gettail(p); | |
| 4333 | |
| 4334 /* remove "doc/" from 'helpfile', if present */ | |
| 4335 if (p == p_hf) | |
| 4336 pend = remove_tail(p, pend, (char_u *)"doc"); | |
| 4337 | |
| 4338 #ifdef USE_EXE_NAME | |
| 4339 # ifdef MACOS_X | |
| 768 | 4340 /* remove "MacOS" from exe_name and add "Resources/vim" */ |
| 7 | 4341 if (p == exe_name) |
| 4342 { | |
| 4343 char_u *pend1; | |
| 768 | 4344 char_u *pnew; |
| 4345 | |
| 4346 pend1 = remove_tail(p, pend, (char_u *)"MacOS"); | |
| 4347 if (pend1 != pend) | |
| 4348 { | |
| 4349 pnew = alloc((unsigned)(pend1 - p) + 15); | |
| 4350 if (pnew != NULL) | |
| 4351 { | |
| 4352 STRNCPY(pnew, p, (pend1 - p)); | |
| 4353 STRCPY(pnew + (pend1 - p), "Resources/vim"); | |
| 4354 p = pnew; | |
| 4355 pend = p + STRLEN(p); | |
| 4356 } | |
| 4357 } | |
| 7 | 4358 } |
| 4359 # endif | |
| 4360 /* remove "src/" from exe_name, if present */ | |
| 4361 if (p == exe_name) | |
| 4362 pend = remove_tail(p, pend, (char_u *)"src"); | |
| 4363 #endif | |
| 4364 | |
| 4365 /* for $VIM, remove "runtime/" or "vim54/", if present */ | |
| 4366 if (!vimruntime) | |
| 4367 { | |
| 4368 pend = remove_tail(p, pend, (char_u *)RUNTIME_DIRNAME); | |
| 4369 pend = remove_tail(p, pend, (char_u *)VIM_VERSION_NODOT); | |
| 4370 } | |
| 4371 | |
| 4372 /* remove trailing path separator */ | |
| 39 | 4373 if (pend > p && after_pathsep(p, pend)) |
| 7 | 4374 --pend; |
| 4375 | |
| 768 | 4376 #ifdef MACOS_X |
| 4377 if (p == exe_name || p == p_hf) | |
| 4378 #endif | |
| 4379 /* check that the result is a directory name */ | |
| 4380 p = vim_strnsave(p, (int)(pend - p)); | |
| 7 | 4381 |
| 4382 if (p != NULL && !mch_isdir(p)) | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13188
diff
changeset
|
4383 VIM_CLEAR(p); |
| 7 | 4384 else |
| 4385 { | |
| 4386 #ifdef USE_EXE_NAME | |
| 4387 /* may add "/vim54" or "/runtime" if it exists */ | |
| 4388 if (vimruntime && (pend = vim_version_dir(p)) != NULL) | |
| 4389 { | |
| 4390 vim_free(p); | |
| 4391 p = pend; | |
| 4392 } | |
| 4393 #endif | |
| 4394 *mustfree = TRUE; | |
| 4395 } | |
| 4396 } | |
| 4397 } | |
| 4398 | |
| 4399 #ifdef HAVE_PATHDEF | |
| 4400 /* When there is a pathdef.c file we can use default_vim_dir and | |
| 4401 * default_vimruntime_dir */ | |
| 4402 if (p == NULL) | |
| 4403 { | |
| 4404 /* Only use default_vimruntime_dir when it is not empty */ | |
| 4405 if (vimruntime && *default_vimruntime_dir != NUL) | |
| 4406 { | |
| 4407 p = default_vimruntime_dir; | |
| 4408 *mustfree = FALSE; | |
| 4409 } | |
| 4410 else if (*default_vim_dir != NUL) | |
| 4411 { | |
| 4412 if (vimruntime && (p = vim_version_dir(default_vim_dir)) != NULL) | |
| 4413 *mustfree = TRUE; | |
| 4414 else | |
| 4415 { | |
| 4416 p = default_vim_dir; | |
| 4417 *mustfree = FALSE; | |
| 4418 } | |
| 4419 } | |
| 4420 } | |
| 4421 #endif | |
| 4422 | |
| 4423 /* | |
| 4424 * Set the environment variable, so that the new value can be found fast | |
| 4425 * next time, and others can also use it (e.g. Perl). | |
| 4426 */ | |
| 4427 if (p != NULL) | |
| 4428 { | |
| 4429 if (vimruntime) | |
| 4430 { | |
| 4431 vim_setenv((char_u *)"VIMRUNTIME", p); | |
| 4432 didset_vimruntime = TRUE; | |
| 4433 } | |
| 4434 else | |
| 4435 { | |
| 4436 vim_setenv((char_u *)"VIM", p); | |
| 4437 didset_vim = TRUE; | |
| 4438 } | |
| 4439 } | |
| 4440 return p; | |
| 4441 } | |
| 4442 | |
| 4443 /* | |
| 4444 * Check if the directory "vimdir/<version>" or "vimdir/runtime" exists. | |
| 4445 * Return NULL if not, return its name in allocated memory otherwise. | |
| 4446 */ | |
| 4447 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4448 vim_version_dir(char_u *vimdir) |
| 7 | 4449 { |
| 4450 char_u *p; | |
| 4451 | |
| 4452 if (vimdir == NULL || *vimdir == NUL) | |
| 4453 return NULL; | |
| 4454 p = concat_fnames(vimdir, (char_u *)VIM_VERSION_NODOT, TRUE); | |
| 4455 if (p != NULL && mch_isdir(p)) | |
| 4456 return p; | |
| 4457 vim_free(p); | |
| 4458 p = concat_fnames(vimdir, (char_u *)RUNTIME_DIRNAME, TRUE); | |
| 4459 if (p != NULL && mch_isdir(p)) | |
| 4460 return p; | |
| 4461 vim_free(p); | |
| 4462 return NULL; | |
| 4463 } | |
| 4464 | |
| 4465 /* | |
| 4466 * If the string between "p" and "pend" ends in "name/", return "pend" minus | |
| 4467 * the length of "name/". Otherwise return "pend". | |
| 4468 */ | |
| 4469 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4470 remove_tail(char_u *p, char_u *pend, char_u *name) |
| 7 | 4471 { |
| 4472 int len = (int)STRLEN(name) + 1; | |
| 4473 char_u *newend = pend - len; | |
| 4474 | |
| 4475 if (newend >= p | |
| 4476 && fnamencmp(newend, name, len - 1) == 0 | |
| 39 | 4477 && (newend == p || after_pathsep(p, newend))) |
| 7 | 4478 return newend; |
| 4479 return pend; | |
| 4480 } | |
| 4481 | |
| 4482 /* | |
| 4483 * Our portable version of setenv. | |
| 4484 */ | |
| 4485 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4486 vim_setenv(char_u *name, char_u *val) |
| 7 | 4487 { |
| 4488 #ifdef HAVE_SETENV | |
| 4489 mch_setenv((char *)name, (char *)val, 1); | |
| 4490 #else | |
| 4491 char_u *envbuf; | |
| 4492 | |
| 4493 /* | |
| 4494 * Putenv does not copy the string, it has to remain | |
| 4495 * valid. The allocated memory will never be freed. | |
| 4496 */ | |
| 4497 envbuf = alloc((unsigned)(STRLEN(name) + STRLEN(val) + 2)); | |
| 4498 if (envbuf != NULL) | |
| 4499 { | |
| 4500 sprintf((char *)envbuf, "%s=%s", name, val); | |
| 4501 putenv((char *)envbuf); | |
| 4502 } | |
| 4503 #endif | |
| 3382 | 4504 #ifdef FEAT_GETTEXT |
| 4505 /* | |
| 4506 * When setting $VIMRUNTIME adjust the directory to find message | |
| 4507 * translations to $VIMRUNTIME/lang. | |
| 4508 */ | |
| 4509 if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0) | |
| 4510 { | |
| 4511 char_u *buf = concat_str(val, (char_u *)"/lang"); | |
| 4512 | |
| 4513 if (buf != NULL) | |
| 4514 { | |
| 4515 bindtextdomain(VIMPACKAGE, (char *)buf); | |
| 4516 vim_free(buf); | |
| 4517 } | |
| 4518 } | |
| 4519 #endif | |
| 7 | 4520 } |
| 4521 | |
| 4522 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) | |
| 4523 /* | |
| 4524 * Function given to ExpandGeneric() to obtain an environment variable name. | |
| 4525 */ | |
| 4526 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4527 get_env_name( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4528 expand_T *xp UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4529 int idx) |
| 7 | 4530 { |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12690
diff
changeset
|
4531 # if defined(AMIGA) |
| 7 | 4532 /* |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12690
diff
changeset
|
4533 * No environ[] on the Amiga. |
| 7 | 4534 */ |
| 4535 return NULL; | |
| 4536 # else | |
| 4537 # ifndef __WIN32__ | |
| 4538 /* Borland C++ 5.2 has this in a header file. */ | |
| 4539 extern char **environ; | |
| 4540 # endif | |
| 17 | 4541 # define ENVNAMELEN 100 |
| 4542 static char_u name[ENVNAMELEN]; | |
| 7 | 4543 char_u *str; |
| 4544 int n; | |
| 4545 | |
| 4546 str = (char_u *)environ[idx]; | |
| 4547 if (str == NULL) | |
| 4548 return NULL; | |
| 4549 | |
| 17 | 4550 for (n = 0; n < ENVNAMELEN - 1; ++n) |
| 7 | 4551 { |
| 4552 if (str[n] == '=' || str[n] == NUL) | |
| 4553 break; | |
| 4554 name[n] = str[n]; | |
| 4555 } | |
| 4556 name[n] = NUL; | |
| 4557 return name; | |
| 4558 # endif | |
| 4559 } | |
| 3744 | 4560 |
| 4561 /* | |
| 4562 * Find all user names for user completion. | |
| 4563 * Done only once and then cached. | |
| 4564 */ | |
| 4565 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4566 init_users(void) |
|
4938
bcb84438bb5b
updated for version 7.3.1214
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
4567 { |
| 3744 | 4568 static int lazy_init_done = FALSE; |
| 4569 | |
| 4570 if (lazy_init_done) | |
| 4571 return; | |
| 4572 | |
| 4573 lazy_init_done = TRUE; | |
| 4574 ga_init2(&ga_users, sizeof(char_u *), 20); | |
| 4575 | |
| 4576 # if defined(HAVE_GETPWENT) && defined(HAVE_PWD_H) | |
| 4577 { | |
| 4578 char_u* user; | |
| 4579 struct passwd* pw; | |
| 4580 | |
| 4581 setpwent(); | |
| 4582 while ((pw = getpwent()) != NULL) | |
| 4583 /* pw->pw_name shouldn't be NULL but just in case... */ | |
| 4584 if (pw->pw_name != NULL) | |
| 4585 { | |
| 4586 if (ga_grow(&ga_users, 1) == FAIL) | |
| 4587 break; | |
| 4588 user = vim_strsave((char_u*)pw->pw_name); | |
| 4589 if (user == NULL) | |
| 4590 break; | |
| 4591 ((char_u **)(ga_users.ga_data))[ga_users.ga_len++] = user; | |
| 4592 } | |
| 4593 endpwent(); | |
| 4594 } | |
| 4595 # endif | |
| 4596 } | |
| 4597 | |
| 4598 /* | |
| 4599 * Function given to ExpandGeneric() to obtain an user names. | |
| 4600 */ | |
| 4601 char_u* | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4602 get_users(expand_T *xp UNUSED, int idx) |
| 3744 | 4603 { |
| 4604 init_users(); | |
| 4605 if (idx < ga_users.ga_len) | |
| 4606 return ((char_u **)ga_users.ga_data)[idx]; | |
| 4607 return NULL; | |
| 4608 } | |
| 4609 | |
| 4610 /* | |
| 4611 * Check whether name matches a user name. Return: | |
| 4612 * 0 if name does not match any user name. | |
| 4613 * 1 if name partially matches the beginning of a user name. | |
| 4614 * 2 is name fully matches a user name. | |
| 4615 */ | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4616 int match_user(char_u* name) |
| 3744 | 4617 { |
| 4618 int i; | |
| 4619 int n = (int)STRLEN(name); | |
| 4620 int result = 0; | |
| 4621 | |
| 4622 init_users(); | |
| 4623 for (i = 0; i < ga_users.ga_len; i++) | |
| 4624 { | |
| 4625 if (STRCMP(((char_u **)ga_users.ga_data)[i], name) == 0) | |
| 4626 return 2; /* full match */ | |
| 4627 if (STRNCMP(((char_u **)ga_users.ga_data)[i], name, n) == 0) | |
| 4628 result = 1; /* partial match */ | |
| 4629 } | |
| 4630 return result; | |
| 4631 } | |
| 7 | 4632 #endif |
| 4633 | |
| 4634 /* | |
| 4635 * Replace home directory by "~" in each space or comma separated file name in | |
| 4636 * 'src'. | |
| 4637 * If anything fails (except when out of space) dst equals src. | |
| 4638 */ | |
| 4639 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4640 home_replace( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4641 buf_T *buf, /* when not NULL, check for help files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4642 char_u *src, /* input file name */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4643 char_u *dst, /* where to put the result */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4644 int dstlen, /* maximum length of the result */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4645 int one) /* if TRUE, only replace one file name, include |
| 7 | 4646 spaces and commas in the file name. */ |
| 4647 { | |
| 4648 size_t dirlen = 0, envlen = 0; | |
| 4649 size_t len; | |
| 3598 | 4650 char_u *homedir_env, *homedir_env_orig; |
| 7 | 4651 char_u *p; |
| 4652 | |
| 4653 if (src == NULL) | |
| 4654 { | |
| 4655 *dst = NUL; | |
| 4656 return; | |
| 4657 } | |
| 4658 | |
| 4659 /* | |
| 4660 * If the file is a help file, remove the path completely. | |
| 4661 */ | |
| 4662 if (buf != NULL && buf->b_help) | |
| 4663 { | |
|
11989
0aae4df3ed8e
patch 8.0.0875: crash with weird command sequence
Christian Brabandt <cb@256bit.org>
parents:
11943
diff
changeset
|
4664 vim_snprintf((char *)dst, dstlen, "%s", gettail(src)); |
| 7 | 4665 return; |
| 4666 } | |
| 4667 | |
| 4668 /* | |
| 4669 * We check both the value of the $HOME environment variable and the | |
| 4670 * "real" home directory. | |
| 4671 */ | |
| 4672 if (homedir != NULL) | |
| 4673 dirlen = STRLEN(homedir); | |
| 4674 | |
| 4675 #ifdef VMS | |
| 3598 | 4676 homedir_env_orig = homedir_env = mch_getenv((char_u *)"SYS$LOGIN"); |
| 7 | 4677 #else |
| 3598 | 4678 homedir_env_orig = homedir_env = mch_getenv((char_u *)"HOME"); |
| 4679 #endif | |
|
12265
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
4680 #ifdef WIN3264 |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
4681 if (homedir_env == NULL) |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
4682 homedir_env_orig = homedir_env = mch_getenv((char_u *)"USERPROFILE"); |
|
03e4be2e3d53
patch 8.0.1012: MS-Windows: problem with $HOME when is was set internally
Christian Brabandt <cb@256bit.org>
parents:
12238
diff
changeset
|
4683 #endif |
| 3658 | 4684 /* Empty is the same as not set. */ |
| 4685 if (homedir_env != NULL && *homedir_env == NUL) | |
| 4686 homedir_env = NULL; | |
| 4687 | |
|
4752
77ecab3bb207
updated for version 7.3.1123
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4688 #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) |
| 3658 | 4689 if (homedir_env != NULL && vim_strchr(homedir_env, '~') != NULL) |
| 3598 | 4690 { |
| 4691 int usedlen = 0; | |
| 4692 int flen; | |
| 4693 char_u *fbuf = NULL; | |
| 4694 | |
| 4695 flen = (int)STRLEN(homedir_env); | |
| 3608 | 4696 (void)modify_fname((char_u *)":p", &usedlen, |
| 4697 &homedir_env, &fbuf, &flen); | |
| 3598 | 4698 flen = (int)STRLEN(homedir_env); |
| 4699 if (flen > 0 && vim_ispathsep(homedir_env[flen - 1])) | |
| 4700 /* Remove the trailing / that is added to a directory. */ | |
| 4701 homedir_env[flen - 1] = NUL; | |
| 4702 } | |
| 7 | 4703 #endif |
| 4704 | |
| 4705 if (homedir_env != NULL) | |
| 4706 envlen = STRLEN(homedir_env); | |
| 4707 | |
| 4708 if (!one) | |
| 4709 src = skipwhite(src); | |
| 4710 while (*src && dstlen > 0) | |
| 4711 { | |
| 4712 /* | |
| 4713 * Here we are at the beginning of a file name. | |
| 4714 * First, check to see if the beginning of the file name matches | |
| 4715 * $HOME or the "real" home directory. Check that there is a '/' | |
| 4716 * after the match (so that if e.g. the file is "/home/pieter/bla", | |
| 4717 * and the home directory is "/home/piet", the file does not end up | |
| 4718 * as "~er/bla" (which would seem to indicate the file "bla" in user | |
| 4719 * er's home directory)). | |
| 4720 */ | |
| 4721 p = homedir; | |
| 4722 len = dirlen; | |
| 4723 for (;;) | |
| 4724 { | |
| 4725 if ( len | |
| 4726 && fnamencmp(src, p, len) == 0 | |
| 4727 && (vim_ispathsep(src[len]) | |
| 4728 || (!one && (src[len] == ',' || src[len] == ' ')) | |
| 4729 || src[len] == NUL)) | |
| 4730 { | |
| 4731 src += len; | |
| 4732 if (--dstlen > 0) | |
| 4733 *dst++ = '~'; | |
| 4734 | |
| 4735 /* | |
| 4736 * If it's just the home directory, add "/". | |
| 4737 */ | |
| 4738 if (!vim_ispathsep(src[0]) && --dstlen > 0) | |
| 4739 *dst++ = '/'; | |
| 4740 break; | |
| 4741 } | |
| 4742 if (p == homedir_env) | |
| 4743 break; | |
| 4744 p = homedir_env; | |
| 4745 len = envlen; | |
| 4746 } | |
| 4747 | |
| 4748 /* if (!one) skip to separator: space or comma */ | |
| 4749 while (*src && (one || (*src != ',' && *src != ' ')) && --dstlen > 0) | |
| 4750 *dst++ = *src++; | |
| 4751 /* skip separator */ | |
| 4752 while ((*src == ' ' || *src == ',') && --dstlen > 0) | |
| 4753 *dst++ = *src++; | |
| 4754 } | |
| 4755 /* if (dstlen == 0) out of space, what to do??? */ | |
| 4756 | |
| 4757 *dst = NUL; | |
| 3598 | 4758 |
| 4759 if (homedir_env != homedir_env_orig) | |
| 4760 vim_free(homedir_env); | |
| 7 | 4761 } |
| 4762 | |
| 4763 /* | |
| 4764 * Like home_replace, store the replaced string in allocated memory. | |
| 4765 * When something fails, NULL is returned. | |
| 4766 */ | |
| 4767 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4768 home_replace_save( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4769 buf_T *buf, /* when not NULL, check for help files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4770 char_u *src) /* input file name */ |
| 7 | 4771 { |
| 4772 char_u *dst; | |
| 4773 unsigned len; | |
| 4774 | |
| 4775 len = 3; /* space for "~/" and trailing NUL */ | |
| 4776 if (src != NULL) /* just in case */ | |
| 4777 len += (unsigned)STRLEN(src); | |
| 4778 dst = alloc(len); | |
| 4779 if (dst != NULL) | |
| 4780 home_replace(buf, src, dst, len, TRUE); | |
| 4781 return dst; | |
| 4782 } | |
| 4783 | |
| 4784 /* | |
| 4785 * Compare two file names and return: | |
| 4786 * FPC_SAME if they both exist and are the same file. | |
| 4787 * FPC_SAMEX if they both don't exist and have the same file name. | |
| 4788 * FPC_DIFF if they both exist and are different files. | |
| 4789 * FPC_NOTX if they both don't exist. | |
| 4790 * FPC_DIFFX if one of them doesn't exist. | |
| 4791 * For the first name environment variables are expanded | |
| 4792 */ | |
| 4793 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4794 fullpathcmp( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4795 char_u *s1, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4796 char_u *s2, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4797 int checkname) /* when both don't exist, check file names */ |
| 7 | 4798 { |
| 4799 #ifdef UNIX | |
| 4800 char_u exp1[MAXPATHL]; | |
| 4801 char_u full1[MAXPATHL]; | |
| 4802 char_u full2[MAXPATHL]; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4803 stat_T st1, st2; |
| 7 | 4804 int r1, r2; |
| 4805 | |
| 4806 expand_env(s1, exp1, MAXPATHL); | |
| 4807 r1 = mch_stat((char *)exp1, &st1); | |
| 4808 r2 = mch_stat((char *)s2, &st2); | |
| 4809 if (r1 != 0 && r2 != 0) | |
| 4810 { | |
| 4811 /* if mch_stat() doesn't work, may compare the names */ | |
| 4812 if (checkname) | |
| 4813 { | |
| 4814 if (fnamecmp(exp1, s2) == 0) | |
| 4815 return FPC_SAMEX; | |
| 4816 r1 = vim_FullName(exp1, full1, MAXPATHL, FALSE); | |
| 4817 r2 = vim_FullName(s2, full2, MAXPATHL, FALSE); | |
| 4818 if (r1 == OK && r2 == OK && fnamecmp(full1, full2) == 0) | |
| 4819 return FPC_SAMEX; | |
| 4820 } | |
| 4821 return FPC_NOTX; | |
| 4822 } | |
| 4823 if (r1 != 0 || r2 != 0) | |
| 4824 return FPC_DIFFX; | |
| 4825 if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) | |
| 4826 return FPC_SAME; | |
| 4827 return FPC_DIFF; | |
| 4828 #else | |
| 4829 char_u *exp1; /* expanded s1 */ | |
| 4830 char_u *full1; /* full path of s1 */ | |
| 4831 char_u *full2; /* full path of s2 */ | |
| 4832 int retval = FPC_DIFF; | |
| 4833 int r1, r2; | |
| 4834 | |
| 4835 /* allocate one buffer to store three paths (alloc()/free() is slow!) */ | |
| 4836 if ((exp1 = alloc(MAXPATHL * 3)) != NULL) | |
| 4837 { | |
| 4838 full1 = exp1 + MAXPATHL; | |
| 4839 full2 = full1 + MAXPATHL; | |
| 4840 | |
| 4841 expand_env(s1, exp1, MAXPATHL); | |
| 4842 r1 = vim_FullName(exp1, full1, MAXPATHL, FALSE); | |
| 4843 r2 = vim_FullName(s2, full2, MAXPATHL, FALSE); | |
| 4844 | |
| 4845 /* If vim_FullName() fails, the file probably doesn't exist. */ | |
| 4846 if (r1 != OK && r2 != OK) | |
| 4847 { | |
| 4848 if (checkname && fnamecmp(exp1, s2) == 0) | |
| 4849 retval = FPC_SAMEX; | |
| 4850 else | |
| 4851 retval = FPC_NOTX; | |
| 4852 } | |
| 4853 else if (r1 != OK || r2 != OK) | |
| 4854 retval = FPC_DIFFX; | |
| 4855 else if (fnamecmp(full1, full2)) | |
| 4856 retval = FPC_DIFF; | |
| 4857 else | |
| 4858 retval = FPC_SAME; | |
| 4859 vim_free(exp1); | |
| 4860 } | |
| 4861 return retval; | |
| 4862 #endif | |
| 4863 } | |
| 4864 | |
| 4865 /* | |
| 10 | 4866 * Get the tail of a path: the file name. |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4867 * When the path ends in a path separator the tail is the NUL after it. |
| 10 | 4868 * Fail safe: never returns NULL. |
| 7 | 4869 */ |
| 4870 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4871 gettail(char_u *fname) |
| 7 | 4872 { |
| 4873 char_u *p1, *p2; | |
| 4874 | |
| 4875 if (fname == NULL) | |
| 4876 return (char_u *)""; | |
| 5432 | 4877 for (p1 = p2 = get_past_head(fname); *p2; ) /* find last part of path */ |
| 4878 { | |
| 4879 if (vim_ispathsep_nocolon(*p2)) | |
| 7 | 4880 p1 = p2 + 1; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4881 MB_PTR_ADV(p2); |
| 7 | 4882 } |
| 4883 return p1; | |
| 4884 } | |
| 4885 | |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4886 #if defined(FEAT_SEARCHPATH) |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
4887 static char_u *gettail_dir(char_u *fname); |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4888 |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4889 /* |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4890 * Return the end of the directory name, on the first path |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4891 * separator: |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4892 * "/path/file", "/path/dir/", "/path//dir", "/file" |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4893 * ^ ^ ^ ^ |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4894 */ |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4895 static char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4896 gettail_dir(char_u *fname) |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4897 { |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4898 char_u *dir_end = fname; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4899 char_u *next_dir_end = fname; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4900 int look_for_sep = TRUE; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4901 char_u *p; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4902 |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4903 for (p = fname; *p != NUL; ) |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4904 { |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4905 if (vim_ispathsep(*p)) |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4906 { |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4907 if (look_for_sep) |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4908 { |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4909 next_dir_end = p; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4910 look_for_sep = FALSE; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4911 } |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4912 } |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4913 else |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4914 { |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4915 if (!look_for_sep) |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4916 dir_end = next_dir_end; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4917 look_for_sep = TRUE; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4918 } |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4919 MB_PTR_ADV(p); |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4920 } |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4921 return dir_end; |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4922 } |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4923 #endif |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
4924 |
| 7 | 4925 /* |
| 39 | 4926 * Get pointer to tail of "fname", including path separators. Putting a NUL |
| 4927 * here leaves the directory name. Takes care of "c:/" and "//". | |
| 4928 * Always returns a valid pointer. | |
| 4929 */ | |
| 4930 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4931 gettail_sep(char_u *fname) |
| 39 | 4932 { |
| 4933 char_u *p; | |
| 4934 char_u *t; | |
| 4935 | |
| 4936 p = get_past_head(fname); /* don't remove the '/' from "c:/file" */ | |
| 4937 t = gettail(fname); | |
| 4938 while (t > p && after_pathsep(fname, t)) | |
| 4939 --t; | |
| 4940 #ifdef VMS | |
| 4941 /* path separator is part of the path */ | |
| 4942 ++t; | |
| 4943 #endif | |
| 4944 return t; | |
| 4945 } | |
| 4946 | |
| 4947 /* | |
| 7 | 4948 * get the next path component (just after the next path separator). |
| 4949 */ | |
| 4950 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4951 getnextcomp(char_u *fname) |
| 7 | 4952 { |
| 4953 while (*fname && !vim_ispathsep(*fname)) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4954 MB_PTR_ADV(fname); |
| 7 | 4955 if (*fname) |
| 4956 ++fname; | |
| 4957 return fname; | |
| 4958 } | |
| 4959 | |
| 4960 /* | |
| 4961 * Get a pointer to one character past the head of a path name. | |
| 4962 * Unix: after "/"; DOS: after "c:\"; Amiga: after "disk:/"; Mac: no head. | |
| 4963 * If there is no head, path is returned. | |
| 4964 */ | |
| 4965 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4966 get_past_head(char_u *path) |
| 7 | 4967 { |
| 4968 char_u *retval; | |
| 4969 | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
4970 #if defined(MSWIN) |
| 7 | 4971 /* may skip "c:" */ |
| 4972 if (isalpha(path[0]) && path[1] == ':') | |
| 4973 retval = path + 2; | |
| 4974 else | |
| 4975 retval = path; | |
| 4976 #else | |
| 4977 # if defined(AMIGA) | |
| 4978 /* may skip "label:" */ | |
| 4979 retval = vim_strchr(path, ':'); | |
| 4980 if (retval == NULL) | |
| 4981 retval = path; | |
| 4982 # else /* Unix */ | |
| 4983 retval = path; | |
| 4984 # endif | |
| 4985 #endif | |
| 4986 | |
| 4987 while (vim_ispathsep(*retval)) | |
| 4988 ++retval; | |
| 4989 | |
| 4990 return retval; | |
| 4991 } | |
| 4992 | |
| 4993 /* | |
| 5432 | 4994 * Return TRUE if 'c' is a path separator. |
| 4995 * Note that for MS-Windows this includes the colon. | |
| 7 | 4996 */ |
| 4997 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
4998 vim_ispathsep(int c) |
| 7 | 4999 { |
| 2823 | 5000 #ifdef UNIX |
| 7 | 5001 return (c == '/'); /* UNIX has ':' inside file names */ |
| 2823 | 5002 #else |
| 5003 # ifdef BACKSLASH_IN_FILENAME | |
| 7 | 5004 return (c == ':' || c == '/' || c == '\\'); |
| 2823 | 5005 # else |
| 5006 # ifdef VMS | |
| 7 | 5007 /* server"user passwd"::device:[full.path.name]fname.extension;version" */ |
| 5008 return (c == ':' || c == '[' || c == ']' || c == '/' | |
| 5009 || c == '<' || c == '>' || c == '"' ); | |
| 2823 | 5010 # else |
| 7 | 5011 return (c == ':' || c == '/'); |
| 2823 | 5012 # endif /* VMS */ |
| 7 | 5013 # endif |
| 2823 | 5014 #endif |
| 7 | 5015 } |
| 5016 | |
| 5432 | 5017 /* |
| 5018 * Like vim_ispathsep(c), but exclude the colon for MS-Windows. | |
| 5019 */ | |
| 5020 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5021 vim_ispathsep_nocolon(int c) |
| 5432 | 5022 { |
| 5023 return vim_ispathsep(c) | |
| 5024 #ifdef BACKSLASH_IN_FILENAME | |
| 5025 && c != ':' | |
| 5026 #endif | |
| 5027 ; | |
| 5028 } | |
| 5029 | |
| 7 | 5030 #if defined(FEAT_SEARCHPATH) || defined(PROTO) |
| 5031 /* | |
| 5032 * return TRUE if 'c' is a path list separator. | |
| 5033 */ | |
| 5034 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5035 vim_ispathlistsep(int c) |
| 7 | 5036 { |
| 5037 #ifdef UNIX | |
| 5038 return (c == ':'); | |
| 5039 #else | |
| 1224 | 5040 return (c == ';'); /* might not be right for every system... */ |
| 7 | 5041 #endif |
| 5042 } | |
| 5043 #endif | |
| 5044 | |
| 819 | 5045 /* |
| 5046 * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname" | |
| 5047 * It's done in-place. | |
| 5048 */ | |
| 5049 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5050 shorten_dir(char_u *str) |
| 819 | 5051 { |
| 5052 char_u *tail, *s, *d; | |
| 5053 int skip = FALSE; | |
| 5054 | |
| 5055 tail = gettail(str); | |
| 5056 d = str; | |
| 5057 for (s = str; ; ++s) | |
| 5058 { | |
| 5059 if (s >= tail) /* copy the whole tail */ | |
| 5060 { | |
| 5061 *d++ = *s; | |
| 5062 if (*s == NUL) | |
| 5063 break; | |
| 5064 } | |
| 5065 else if (vim_ispathsep(*s)) /* copy '/' and next char */ | |
| 5066 { | |
| 5067 *d++ = *s; | |
| 5068 skip = FALSE; | |
| 5069 } | |
| 5070 else if (!skip) | |
| 5071 { | |
| 5072 *d++ = *s; /* copy next char */ | |
| 5073 if (*s != '~' && *s != '.') /* and leading "~" and "." */ | |
| 5074 skip = TRUE; | |
| 5075 # ifdef FEAT_MBYTE | |
| 5076 if (has_mbyte) | |
| 5077 { | |
| 5078 int l = mb_ptr2len(s); | |
| 5079 | |
| 5080 while (--l > 0) | |
| 927 | 5081 *d++ = *++s; |
| 819 | 5082 } |
| 5083 # endif | |
| 5084 } | |
| 5085 } | |
| 5086 } | |
| 5087 | |
| 594 | 5088 /* |
| 5089 * Return TRUE if the directory of "fname" exists, FALSE otherwise. | |
| 5090 * Also returns TRUE if there is no directory name. | |
| 5091 * "fname" must be writable!. | |
| 5092 */ | |
| 5093 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5094 dir_of_file_exists(char_u *fname) |
| 594 | 5095 { |
| 5096 char_u *p; | |
| 5097 int c; | |
| 5098 int retval; | |
| 5099 | |
| 5100 p = gettail_sep(fname); | |
| 5101 if (p == fname) | |
| 5102 return TRUE; | |
| 5103 c = *p; | |
| 5104 *p = NUL; | |
| 5105 retval = mch_isdir(fname); | |
| 5106 *p = c; | |
| 5107 return retval; | |
| 5108 } | |
| 5109 | |
| 4242 | 5110 /* |
| 5111 * Versions of fnamecmp() and fnamencmp() that handle '/' and '\' equally | |
| 5112 * and deal with 'fileignorecase'. | |
| 7 | 5113 */ |
| 5114 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5115 vim_fnamecmp(char_u *x, char_u *y) |
| 7 | 5116 { |
| 4242 | 5117 #ifdef BACKSLASH_IN_FILENAME |
| 7 | 5118 return vim_fnamencmp(x, y, MAXPATHL); |
| 4242 | 5119 #else |
| 5120 if (p_fic) | |
| 5121 return MB_STRICMP(x, y); | |
| 5122 return STRCMP(x, y); | |
| 5123 #endif | |
| 7 | 5124 } |
| 5125 | |
| 5126 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5127 vim_fnamencmp(char_u *x, char_u *y, size_t len) |
| 7 | 5128 { |
| 4242 | 5129 #ifdef BACKSLASH_IN_FILENAME |
| 4246 | 5130 char_u *px = x; |
| 5131 char_u *py = y; | |
| 5132 int cx = NUL; | |
| 5133 int cy = NUL; | |
| 5134 | |
| 5135 while (len > 0) | |
| 5136 { | |
| 5137 cx = PTR2CHAR(px); | |
| 5138 cy = PTR2CHAR(py); | |
| 5139 if (cx == NUL || cy == NUL | |
| 5140 || ((p_fic ? MB_TOLOWER(cx) != MB_TOLOWER(cy) : cx != cy) | |
| 5141 && !(cx == '/' && cy == '\\') | |
| 5142 && !(cx == '\\' && cy == '/'))) | |
| 7 | 5143 break; |
| 4246 | 5144 len -= MB_PTR2LEN(px); |
| 5145 px += MB_PTR2LEN(px); | |
| 5146 py += MB_PTR2LEN(py); | |
| 7 | 5147 } |
| 5148 if (len == 0) | |
| 5149 return 0; | |
| 4246 | 5150 return (cx - cy); |
| 4242 | 5151 #else |
| 5152 if (p_fic) | |
| 5153 return MB_STRNICMP(x, y, len); | |
| 5154 return STRNCMP(x, y, len); | |
| 5155 #endif | |
| 5156 } | |
| 7 | 5157 |
| 5158 /* | |
| 5159 * Concatenate file names fname1 and fname2 into allocated memory. | |
| 1224 | 5160 * Only add a '/' or '\\' when 'sep' is TRUE and it is necessary. |
| 7 | 5161 */ |
| 5162 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5163 concat_fnames(char_u *fname1, char_u *fname2, int sep) |
| 7 | 5164 { |
| 5165 char_u *dest; | |
| 5166 | |
| 5167 dest = alloc((unsigned)(STRLEN(fname1) + STRLEN(fname2) + 3)); | |
| 5168 if (dest != NULL) | |
| 5169 { | |
| 5170 STRCPY(dest, fname1); | |
| 5171 if (sep) | |
| 5172 add_pathsep(dest); | |
| 5173 STRCAT(dest, fname2); | |
| 5174 } | |
| 5175 return dest; | |
| 5176 } | |
| 5177 | |
| 115 | 5178 /* |
| 5179 * Concatenate two strings and return the result in allocated memory. | |
| 5180 * Returns NULL when out of memory. | |
| 5181 */ | |
| 5182 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5183 concat_str(char_u *str1, char_u *str2) |
| 115 | 5184 { |
| 5185 char_u *dest; | |
| 5186 size_t l = STRLEN(str1); | |
| 5187 | |
| 5188 dest = alloc((unsigned)(l + STRLEN(str2) + 1L)); | |
| 5189 if (dest != NULL) | |
| 5190 { | |
| 5191 STRCPY(dest, str1); | |
| 5192 STRCPY(dest + l, str2); | |
| 5193 } | |
| 5194 return dest; | |
| 5195 } | |
| 5196 | |
| 7 | 5197 /* |
| 5198 * Add a path separator to a file name, unless it already ends in a path | |
| 5199 * separator. | |
| 5200 */ | |
| 5201 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5202 add_pathsep(char_u *p) |
| 7 | 5203 { |
| 39 | 5204 if (*p != NUL && !after_pathsep(p, p + STRLEN(p))) |
| 7 | 5205 STRCAT(p, PATHSEPSTR); |
| 5206 } | |
| 5207 | |
| 5208 /* | |
| 5209 * FullName_save - Make an allocated copy of a full file name. | |
| 5210 * Returns NULL when out of memory. | |
| 5211 */ | |
| 5212 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5213 FullName_save( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5214 char_u *fname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5215 int force) /* force expansion, even when it already looks |
| 3584 | 5216 * like a full path name */ |
| 7 | 5217 { |
| 5218 char_u *buf; | |
| 5219 char_u *new_fname = NULL; | |
| 5220 | |
| 5221 if (fname == NULL) | |
| 5222 return NULL; | |
| 5223 | |
| 5224 buf = alloc((unsigned)MAXPATHL); | |
| 5225 if (buf != NULL) | |
| 5226 { | |
| 5227 if (vim_FullName(fname, buf, MAXPATHL, force) != FAIL) | |
| 5228 new_fname = vim_strsave(buf); | |
| 5229 else | |
| 5230 new_fname = vim_strsave(fname); | |
| 5231 vim_free(buf); | |
| 5232 } | |
| 5233 return new_fname; | |
| 5234 } | |
| 5235 | |
| 5236 #if defined(FEAT_CINDENT) || defined(FEAT_SYN_HL) | |
| 5237 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5238 static char_u *skip_string(char_u *p); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5239 static pos_T *ind_find_start_comment(void); |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5240 static pos_T *ind_find_start_CORS(linenr_T *is_raw); |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5241 static pos_T *find_start_rawstring(int ind_maxcomment); |
| 7 | 5242 |
| 5243 /* | |
| 5244 * Find the start of a comment, not knowing if we are in a comment right now. | |
| 5245 * Search starts at w_cursor.lnum and goes backwards. | |
| 6971 | 5246 * Return NULL when not inside a comment. |
| 7 | 5247 */ |
| 5442 | 5248 static pos_T * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5249 ind_find_start_comment(void) /* XXX */ |
| 5442 | 5250 { |
| 5251 return find_start_comment(curbuf->b_ind_maxcomment); | |
| 5252 } | |
| 5253 | |
| 7 | 5254 pos_T * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5255 find_start_comment(int ind_maxcomment) /* XXX */ |
| 7 | 5256 { |
| 5257 pos_T *pos; | |
| 5258 char_u *line; | |
| 5259 char_u *p; | |
| 829 | 5260 int cur_maxcomment = ind_maxcomment; |
| 5261 | |
| 5262 for (;;) | |
| 5263 { | |
| 5264 pos = findmatchlimit(NULL, '*', FM_BACKWARD, cur_maxcomment); | |
| 5265 if (pos == NULL) | |
| 5266 break; | |
| 5267 | |
| 5268 /* | |
| 5269 * Check if the comment start we found is inside a string. | |
| 5270 * If it is then restrict the search to below this line and try again. | |
| 5271 */ | |
| 5272 line = ml_get(pos->lnum); | |
| 1883 | 5273 for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p) |
| 829 | 5274 p = skip_string(p); |
| 1883 | 5275 if ((colnr_T)(p - line) <= pos->col) |
| 829 | 5276 break; |
| 5277 cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1; | |
| 5278 if (cur_maxcomment <= 0) | |
| 5279 { | |
| 5280 pos = NULL; | |
| 5281 break; | |
| 5282 } | |
| 5283 } | |
| 7 | 5284 return pos; |
| 5285 } | |
| 5286 | |
| 5287 /* | |
| 6971 | 5288 * Find the start of a comment or raw string, not knowing if we are in a |
| 5289 * comment or raw string right now. | |
| 5290 * Search starts at w_cursor.lnum and goes backwards. | |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5291 * If is_raw is given and returns start of raw_string, sets it to true. |
| 6971 | 5292 * Return NULL when not inside a comment or raw string. |
| 5293 * "CORS" -> Comment Or Raw String | |
| 5294 */ | |
| 5295 static pos_T * | |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5296 ind_find_start_CORS(linenr_T *is_raw) /* XXX */ |
| 6971 | 5297 { |
|
7160
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5298 static pos_T comment_pos_copy; |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5299 pos_T *comment_pos; |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5300 pos_T *rs_pos; |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5301 |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5302 comment_pos = find_start_comment(curbuf->b_ind_maxcomment); |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5303 if (comment_pos != NULL) |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5304 { |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5305 /* Need to make a copy of the static pos in findmatchlimit(), |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5306 * calling find_start_rawstring() may change it. */ |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5307 comment_pos_copy = *comment_pos; |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5308 comment_pos = &comment_pos_copy; |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5309 } |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
5310 rs_pos = find_start_rawstring(curbuf->b_ind_maxcomment); |
| 6971 | 5311 |
| 5312 /* If comment_pos is before rs_pos the raw string is inside the comment. | |
| 5313 * If rs_pos is before comment_pos the comment is inside the raw string. */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11087
diff
changeset
|
5314 if (comment_pos == NULL || (rs_pos != NULL |
|
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11087
diff
changeset
|
5315 && LT_POS(*rs_pos, *comment_pos))) |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5316 { |
|
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5317 if (is_raw != NULL && rs_pos != NULL) |
|
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5318 *is_raw = rs_pos->lnum; |
| 6971 | 5319 return rs_pos; |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5320 } |
| 6971 | 5321 return comment_pos; |
| 5322 } | |
| 5323 | |
| 5324 /* | |
| 5325 * Find the start of a raw string, not knowing if we are in one right now. | |
| 5326 * Search starts at w_cursor.lnum and goes backwards. | |
| 5327 * Return NULL when not inside a raw string. | |
| 5328 */ | |
| 5329 static pos_T * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5330 find_start_rawstring(int ind_maxcomment) /* XXX */ |
| 6971 | 5331 { |
| 5332 pos_T *pos; | |
| 5333 char_u *line; | |
| 5334 char_u *p; | |
| 5335 int cur_maxcomment = ind_maxcomment; | |
| 5336 | |
| 5337 for (;;) | |
| 5338 { | |
| 5339 pos = findmatchlimit(NULL, 'R', FM_BACKWARD, cur_maxcomment); | |
| 5340 if (pos == NULL) | |
| 5341 break; | |
| 5342 | |
| 5343 /* | |
| 5344 * Check if the raw string start we found is inside a string. | |
| 5345 * If it is then restrict the search to below this line and try again. | |
| 5346 */ | |
| 5347 line = ml_get(pos->lnum); | |
| 5348 for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p) | |
| 5349 p = skip_string(p); | |
| 5350 if ((colnr_T)(p - line) <= pos->col) | |
| 5351 break; | |
| 5352 cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1; | |
| 5353 if (cur_maxcomment <= 0) | |
| 5354 { | |
| 5355 pos = NULL; | |
| 5356 break; | |
| 5357 } | |
| 5358 } | |
| 5359 return pos; | |
| 5360 } | |
| 5361 | |
| 5362 /* | |
| 7 | 5363 * Skip to the end of a "string" and a 'c' character. |
| 5364 * If there is no string or character, return argument unmodified. | |
| 5365 */ | |
| 5366 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5367 skip_string(char_u *p) |
| 7 | 5368 { |
| 5369 int i; | |
| 5370 | |
| 5371 /* | |
| 5372 * We loop, because strings may be concatenated: "date""time". | |
| 5373 */ | |
| 5374 for ( ; ; ++p) | |
| 5375 { | |
| 5376 if (p[0] == '\'') /* 'c' or '\n' or '\000' */ | |
| 5377 { | |
| 5378 if (!p[1]) /* ' at end of line */ | |
| 5379 break; | |
| 5380 i = 2; | |
| 5381 if (p[1] == '\\') /* '\n' or '\000' */ | |
| 5382 { | |
| 5383 ++i; | |
| 5384 while (vim_isdigit(p[i - 1])) /* '\000' */ | |
| 5385 ++i; | |
| 5386 } | |
| 5387 if (p[i] == '\'') /* check for trailing ' */ | |
| 5388 { | |
| 5389 p += i; | |
| 5390 continue; | |
| 5391 } | |
| 5392 } | |
| 5393 else if (p[0] == '"') /* start of string */ | |
| 5394 { | |
| 5395 for (++p; p[0]; ++p) | |
| 5396 { | |
| 5397 if (p[0] == '\\' && p[1] != NUL) | |
| 5398 ++p; | |
| 5399 else if (p[0] == '"') /* end of string */ | |
| 5400 break; | |
| 5401 } | |
| 5402 if (p[0] == '"') | |
| 6971 | 5403 continue; /* continue for another string */ |
| 5404 } | |
| 5405 else if (p[0] == 'R' && p[1] == '"') | |
| 5406 { | |
| 5407 /* Raw string: R"[delim](...)[delim]" */ | |
| 5408 char_u *delim = p + 2; | |
| 5409 char_u *paren = vim_strchr(delim, '('); | |
| 5410 | |
| 5411 if (paren != NULL) | |
| 5412 { | |
| 5413 size_t delim_len = paren - delim; | |
| 5414 | |
| 5415 for (p += 3; *p; ++p) | |
| 5416 if (p[0] == ')' && STRNCMP(p + 1, delim, delim_len) == 0 | |
| 5417 && p[delim_len + 1] == '"') | |
| 5418 { | |
| 5419 p += delim_len + 1; | |
| 5420 break; | |
| 5421 } | |
| 5422 if (p[0] == '"') | |
| 5423 continue; /* continue for another string */ | |
| 5424 } | |
| 7 | 5425 } |
| 5426 break; /* no string found */ | |
| 5427 } | |
| 5428 if (!*p) | |
| 5429 --p; /* backup from NUL */ | |
| 5430 return p; | |
| 5431 } | |
| 5432 #endif /* FEAT_CINDENT || FEAT_SYN_HL */ | |
| 5433 | |
| 5434 #if defined(FEAT_CINDENT) || defined(PROTO) | |
| 5435 | |
| 5436 /* | |
| 5437 * Do C or expression indenting on the current line. | |
| 5438 */ | |
| 5439 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5440 do_c_expr_indent(void) |
| 7 | 5441 { |
| 5442 # ifdef FEAT_EVAL | |
| 5443 if (*curbuf->b_p_inde != NUL) | |
| 5444 fixthisline(get_expr_indent); | |
| 5445 else | |
| 5446 # endif | |
| 5447 fixthisline(get_c_indent); | |
| 5448 } | |
| 5449 | |
| 6803 | 5450 /* Find result cache for cpp_baseclass */ |
| 5451 typedef struct { | |
| 5452 int found; | |
| 5453 lpos_T lpos; | |
| 5454 } cpp_baseclass_cache_T; | |
| 5455 | |
| 7 | 5456 /* |
| 5457 * Functions for C-indenting. | |
| 5458 * Most of this originally comes from Eric Fischer. | |
| 5459 */ | |
| 5460 /* | |
| 5461 * Below "XXX" means that this function may unlock the current line. | |
| 5462 */ | |
| 5463 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5464 static char_u *cin_skipcomment(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5465 static int cin_nocode(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5466 static pos_T *find_line_comment(void); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5467 static int cin_has_js_key(char_u *text); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5468 static int cin_islabel_skip(char_u **); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5469 static int cin_isdefault(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5470 static char_u *after_label(char_u *l); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5471 static int get_indent_nolabel(linenr_T lnum); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5472 static int skip_label(linenr_T, char_u **pp); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5473 static int cin_first_id_amount(void); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5474 static int cin_get_equal_amount(linenr_T lnum); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5475 static int cin_ispreproc(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5476 static int cin_iscomment(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5477 static int cin_islinecomment(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5478 static int cin_isterminated(char_u *, int, int); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5479 static int cin_isinit(void); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5480 static int cin_isfuncdecl(char_u **, linenr_T, linenr_T); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5481 static int cin_isif(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5482 static int cin_iselse(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5483 static int cin_isdo(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5484 static int cin_iswhileofdo(char_u *, linenr_T); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5485 static int cin_is_if_for_while_before_offset(char_u *line, int *poffset); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5486 static int cin_iswhileofdo_end(int terminated); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5487 static int cin_isbreak(char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5488 static int cin_is_cpp_baseclass(cpp_baseclass_cache_T *cached); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5489 static int get_baseclass_amount(int col); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5490 static int cin_ends_in(char_u *, char_u *, char_u *); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5491 static int cin_starts_with(char_u *s, char *word); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5492 static int cin_skip2pos(pos_T *trypos); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5493 static pos_T *find_start_brace(void); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5494 static pos_T *find_match_paren(int); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5495 static pos_T *find_match_char(int c, int ind_maxparen); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5496 static int corr_ind_maxparen(pos_T *startpos); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5497 static int find_last_paren(char_u *l, int start, int end); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5498 static int find_match(int lookfor, linenr_T ourscope); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
5499 static int cin_is_cpp_namespace(char_u *); |
| 7 | 5500 |
| 5501 /* | |
| 5502 * Skip over white space and C comments within the line. | |
| 1096 | 5503 * Also skip over Perl/shell comments if desired. |
| 7 | 5504 */ |
| 5505 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5506 cin_skipcomment(char_u *s) |
| 7 | 5507 { |
| 5508 while (*s) | |
| 5509 { | |
| 1096 | 5510 char_u *prev_s = s; |
| 5511 | |
| 7 | 5512 s = skipwhite(s); |
| 1096 | 5513 |
| 5514 /* Perl/shell # comment comment continues until eol. Require a space | |
| 5515 * before # to avoid recognizing $#array. */ | |
| 5438 | 5516 if (curbuf->b_ind_hash_comment != 0 && s != prev_s && *s == '#') |
| 1096 | 5517 { |
| 5518 s += STRLEN(s); | |
| 5519 break; | |
| 5520 } | |
| 7 | 5521 if (*s != '/') |
| 5522 break; | |
| 5523 ++s; | |
| 5524 if (*s == '/') /* slash-slash comment continues till eol */ | |
| 5525 { | |
| 5526 s += STRLEN(s); | |
| 5527 break; | |
| 5528 } | |
| 5529 if (*s != '*') | |
| 5530 break; | |
| 5531 for (++s; *s; ++s) /* skip slash-star comment */ | |
| 5532 if (s[0] == '*' && s[1] == '/') | |
| 5533 { | |
| 5534 s += 2; | |
| 5535 break; | |
| 5536 } | |
| 5537 } | |
| 5538 return s; | |
| 5539 } | |
| 5540 | |
| 5541 /* | |
| 2805 | 5542 * Return TRUE if there is no code at *s. White space and comments are |
| 7 | 5543 * not considered code. |
| 5544 */ | |
| 5545 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5546 cin_nocode(char_u *s) |
| 7 | 5547 { |
| 5548 return *cin_skipcomment(s) == NUL; | |
| 5549 } | |
| 5550 | |
| 5551 /* | |
| 5552 * Check previous lines for a "//" line comment, skipping over blank lines. | |
| 5553 */ | |
| 5554 static pos_T * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5555 find_line_comment(void) /* XXX */ |
| 7 | 5556 { |
| 5557 static pos_T pos; | |
| 5558 char_u *line; | |
| 5559 char_u *p; | |
| 5560 | |
| 5561 pos = curwin->w_cursor; | |
| 5562 while (--pos.lnum > 0) | |
| 5563 { | |
| 5564 line = ml_get(pos.lnum); | |
| 5565 p = skipwhite(line); | |
| 5566 if (cin_islinecomment(p)) | |
| 5567 { | |
| 5568 pos.col = (int)(p - line); | |
| 5569 return &pos; | |
| 5570 } | |
| 5571 if (*p != NUL) | |
| 5572 break; | |
| 5573 } | |
| 5574 return NULL; | |
| 5575 } | |
| 5576 | |
| 5577 /* | |
| 6030 | 5578 * Return TRUE if "text" starts with "key:". |
| 5579 */ | |
| 5580 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5581 cin_has_js_key(char_u *text) |
| 6030 | 5582 { |
| 5583 char_u *s = skipwhite(text); | |
| 6104 | 5584 int quote = -1; |
| 6030 | 5585 |
| 5586 if (*s == '\'' || *s == '"') | |
| 5587 { | |
| 5588 /* can be 'key': or "key": */ | |
| 5589 quote = *s; | |
| 5590 ++s; | |
| 5591 } | |
| 5592 if (!vim_isIDc(*s)) /* need at least one ID character */ | |
| 5593 return FALSE; | |
| 5594 | |
| 5595 while (vim_isIDc(*s)) | |
| 5596 ++s; | |
| 5597 if (*s == quote) | |
| 5598 ++s; | |
| 5599 | |
| 5600 s = cin_skipcomment(s); | |
| 5601 | |
| 5602 /* "::" is not a label, it's C++ */ | |
| 5603 return (*s == ':' && s[1] != ':'); | |
| 5604 } | |
| 5605 | |
| 5606 /* | |
| 7 | 5607 * Check if string matches "label:"; move to character after ':' if true. |
| 6030 | 5608 * "*s" must point to the start of the label, if there is one. |
| 7 | 5609 */ |
| 5610 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5611 cin_islabel_skip(char_u **s) |
| 7 | 5612 { |
| 5613 if (!vim_isIDc(**s)) /* need at least one ID character */ | |
| 5614 return FALSE; | |
| 5615 | |
| 5616 while (vim_isIDc(**s)) | |
| 5617 (*s)++; | |
| 5618 | |
| 5619 *s = cin_skipcomment(*s); | |
| 5620 | |
| 5621 /* "::" is not a label, it's C++ */ | |
| 5622 return (**s == ':' && *++*s != ':'); | |
| 5623 } | |
| 5624 | |
| 5625 /* | |
| 5626 * Recognize a label: "label:". | |
| 5627 * Note: curwin->w_cursor must be where we are looking for the label. | |
| 5628 */ | |
| 5629 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5630 cin_islabel(void) /* XXX */ |
| 7 | 5631 { |
| 5632 char_u *s; | |
| 5633 | |
| 5634 s = cin_skipcomment(ml_get_curline()); | |
| 5635 | |
| 5636 /* | |
| 5637 * Exclude "default" from labels, since it should be indented | |
| 5638 * like a switch label. Same for C++ scope declarations. | |
| 5639 */ | |
| 5640 if (cin_isdefault(s)) | |
| 5641 return FALSE; | |
| 5642 if (cin_isscopedecl(s)) | |
| 5643 return FALSE; | |
| 5644 | |
| 5645 if (cin_islabel_skip(&s)) | |
| 5646 { | |
| 5647 /* | |
| 5648 * Only accept a label if the previous line is terminated or is a case | |
| 5649 * label. | |
| 5650 */ | |
| 5651 pos_T cursor_save; | |
| 5652 pos_T *trypos; | |
| 5653 char_u *line; | |
| 5654 | |
| 5655 cursor_save = curwin->w_cursor; | |
| 5656 while (curwin->w_cursor.lnum > 1) | |
| 5657 { | |
| 5658 --curwin->w_cursor.lnum; | |
| 5659 | |
| 5660 /* | |
| 6971 | 5661 * If we're in a comment or raw string now, skip to the start of |
| 5662 * it. | |
| 7 | 5663 */ |
| 5664 curwin->w_cursor.col = 0; | |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
5665 if ((trypos = ind_find_start_CORS(NULL)) != NULL) /* XXX */ |
| 7 | 5666 curwin->w_cursor = *trypos; |
| 5667 | |
| 5668 line = ml_get_curline(); | |
| 5669 if (cin_ispreproc(line)) /* ignore #defines, #if, etc. */ | |
| 5670 continue; | |
| 5671 if (*(line = cin_skipcomment(line)) == NUL) | |
| 5672 continue; | |
| 5673 | |
| 5674 curwin->w_cursor = cursor_save; | |
| 5675 if (cin_isterminated(line, TRUE, FALSE) | |
| 5676 || cin_isscopedecl(line) | |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5677 || cin_iscase(line, TRUE) |
| 7 | 5678 || (cin_islabel_skip(&line) && cin_nocode(line))) |
| 5679 return TRUE; | |
| 5680 return FALSE; | |
| 5681 } | |
| 5682 curwin->w_cursor = cursor_save; | |
| 5683 return TRUE; /* label at start of file??? */ | |
| 5684 } | |
| 5685 return FALSE; | |
| 5686 } | |
| 5687 | |
| 5688 /* | |
| 4184 | 5689 * Recognize structure initialization and enumerations: |
| 5690 * "[typedef] [static|public|protected|private] enum" | |
| 5691 * "[typedef] [static|public|protected|private] = {" | |
| 7 | 5692 */ |
| 5693 static int | |
| 5694 cin_isinit(void) | |
| 5695 { | |
| 5696 char_u *s; | |
| 4184 | 5697 static char *skip[] = {"static", "public", "protected", "private"}; |
| 7 | 5698 |
| 5699 s = cin_skipcomment(ml_get_curline()); | |
| 5700 | |
| 4184 | 5701 if (cin_starts_with(s, "typedef")) |
| 7 | 5702 s = cin_skipcomment(s + 7); |
| 5703 | |
| 4184 | 5704 for (;;) |
| 5705 { | |
| 5706 int i, l; | |
| 5707 | |
| 5708 for (i = 0; i < (int)(sizeof(skip) / sizeof(char *)); ++i) | |
| 5709 { | |
| 4207 | 5710 l = (int)strlen(skip[i]); |
| 4184 | 5711 if (cin_starts_with(s, skip[i])) |
| 5712 { | |
| 5713 s = cin_skipcomment(s + l); | |
| 5714 l = 0; | |
| 5715 break; | |
| 5716 } | |
| 5717 } | |
| 5718 if (l != 0) | |
| 5719 break; | |
| 5720 } | |
| 5721 | |
| 5722 if (cin_starts_with(s, "enum")) | |
| 7 | 5723 return TRUE; |
| 5724 | |
| 5725 if (cin_ends_in(s, (char_u *)"=", (char_u *)"{")) | |
| 5726 return TRUE; | |
| 5727 | |
| 5728 return FALSE; | |
| 5729 } | |
| 5730 | |
| 5731 /* | |
| 5732 * Recognize a switch label: "case .*:" or "default:". | |
| 5733 */ | |
| 5734 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5735 cin_iscase( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5736 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5737 int strict) /* Allow relaxed check of case statement for JS */ |
| 7 | 5738 { |
| 5739 s = cin_skipcomment(s); | |
| 4184 | 5740 if (cin_starts_with(s, "case")) |
| 7 | 5741 { |
| 5742 for (s += 4; *s; ++s) | |
| 5743 { | |
| 5744 s = cin_skipcomment(s); | |
| 5745 if (*s == ':') | |
| 5746 { | |
| 5747 if (s[1] == ':') /* skip over "::" for C++ */ | |
| 5748 ++s; | |
| 5749 else | |
| 5750 return TRUE; | |
| 5751 } | |
| 5752 if (*s == '\'' && s[1] && s[2] == '\'') | |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5753 s += 2; /* skip over ':' */ |
| 7 | 5754 else if (*s == '/' && (s[1] == '*' || s[1] == '/')) |
| 5755 return FALSE; /* stop at comment */ | |
| 5756 else if (*s == '"') | |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5757 { |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5758 /* JS etc. */ |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5759 if (strict) |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5760 return FALSE; /* stop at string */ |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5761 else |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5762 return TRUE; |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5763 } |
| 7 | 5764 } |
| 5765 return FALSE; | |
| 5766 } | |
| 5767 | |
| 5768 if (cin_isdefault(s)) | |
| 5769 return TRUE; | |
| 5770 return FALSE; | |
| 5771 } | |
| 5772 | |
| 5773 /* | |
| 5774 * Recognize a "default" switch label. | |
| 5775 */ | |
| 5776 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5777 cin_isdefault(char_u *s) |
| 7 | 5778 { |
| 5779 return (STRNCMP(s, "default", 7) == 0 | |
| 5780 && *(s = cin_skipcomment(s + 7)) == ':' | |
| 5781 && s[1] != ':'); | |
| 5782 } | |
| 5783 | |
| 5784 /* | |
|
2460
b8eb7c0f74c2
Remove unused variable and STRLEN(). (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2435
diff
changeset
|
5785 * Recognize a "public/private/protected" scope declaration label. |
| 7 | 5786 */ |
| 5787 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5788 cin_isscopedecl(char_u *s) |
| 7 | 5789 { |
| 5790 int i; | |
| 5791 | |
| 5792 s = cin_skipcomment(s); | |
| 5793 if (STRNCMP(s, "public", 6) == 0) | |
| 5794 i = 6; | |
| 5795 else if (STRNCMP(s, "protected", 9) == 0) | |
| 5796 i = 9; | |
| 5797 else if (STRNCMP(s, "private", 7) == 0) | |
| 5798 i = 7; | |
| 5799 else | |
| 5800 return FALSE; | |
| 5801 return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':'); | |
| 5802 } | |
| 5803 | |
| 2857 | 5804 /* Maximum number of lines to search back for a "namespace" line. */ |
| 5805 #define FIND_NAMESPACE_LIM 20 | |
| 5806 | |
| 5807 /* | |
| 5808 * Recognize a "namespace" scope declaration. | |
| 5809 */ | |
| 5810 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5811 cin_is_cpp_namespace(char_u *s) |
| 2857 | 5812 { |
| 5813 char_u *p; | |
| 5814 int has_name = FALSE; | |
|
10396
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5815 int has_name_start = FALSE; |
| 2857 | 5816 |
| 5817 s = cin_skipcomment(s); | |
| 5818 if (STRNCMP(s, "namespace", 9) == 0 && (s[9] == NUL || !vim_iswordc(s[9]))) | |
| 5819 { | |
| 5820 p = cin_skipcomment(skipwhite(s + 9)); | |
| 5821 while (*p != NUL) | |
| 5822 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5823 if (VIM_ISWHITE(*p)) |
| 2857 | 5824 { |
| 5825 has_name = TRUE; /* found end of a name */ | |
| 5826 p = cin_skipcomment(skipwhite(p)); | |
| 5827 } | |
| 5828 else if (*p == '{') | |
| 5829 { | |
| 5830 break; | |
| 5831 } | |
| 5832 else if (vim_iswordc(*p)) | |
| 5833 { | |
|
10396
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5834 has_name_start = TRUE; |
| 2857 | 5835 if (has_name) |
| 5836 return FALSE; /* word character after skipping past name */ | |
| 5837 ++p; | |
| 5838 } | |
|
10396
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5839 else if (p[0] == ':' && p[1] == ':' && vim_iswordc(p[2])) |
|
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5840 { |
|
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5841 if (!has_name_start || has_name) |
|
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5842 return FALSE; |
|
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5843 /* C++ 17 nested namespace */ |
|
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5844 p += 3; |
|
0bbbe99c8432
commit https://github.com/vim/vim/commit/ca8b8d6956dd881de6446fc32c38e817a364a6cc
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5845 } |
| 2857 | 5846 else |
| 5847 { | |
| 5848 return FALSE; | |
| 5849 } | |
| 5850 } | |
| 5851 return TRUE; | |
| 5852 } | |
| 5853 return FALSE; | |
| 5854 } | |
| 5855 | |
| 7 | 5856 /* |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5857 * Recognize a `extern "C"` or `extern "C++"` linkage specifications. |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5858 */ |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5859 static int |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5860 cin_is_cpp_extern_c(char_u *s) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5861 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5862 char_u *p; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5863 int has_string_literal = FALSE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5864 |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5865 s = cin_skipcomment(s); |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5866 if (STRNCMP(s, "extern", 6) == 0 && (s[6] == NUL || !vim_iswordc(s[6]))) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5867 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5868 p = cin_skipcomment(skipwhite(s + 6)); |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5869 while (*p != NUL) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5870 { |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5871 if (VIM_ISWHITE(*p)) |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5872 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5873 p = cin_skipcomment(skipwhite(p)); |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5874 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5875 else if (*p == '{') |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5876 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5877 break; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5878 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5879 else if (p[0] == '"' && p[1] == 'C' && p[2] == '"') |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5880 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5881 if (has_string_literal) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5882 return FALSE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5883 has_string_literal = TRUE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5884 p += 3; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5885 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5886 else if (p[0] == '"' && p[1] == 'C' && p[2] == '+' && p[3] == '+' |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5887 && p[4] == '"') |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5888 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5889 if (has_string_literal) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5890 return FALSE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5891 has_string_literal = TRUE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5892 p += 5; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5893 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5894 else |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5895 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5896 return FALSE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5897 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5898 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5899 return has_string_literal ? TRUE : FALSE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5900 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5901 return FALSE; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5902 } |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5903 |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
5904 /* |
| 7 | 5905 * Return a pointer to the first non-empty non-comment character after a ':'. |
| 5906 * Return NULL if not found. | |
| 5907 * case 234: a = b; | |
| 5908 * ^ | |
| 5909 */ | |
| 5910 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5911 after_label(char_u *l) |
| 7 | 5912 { |
| 5913 for ( ; *l; ++l) | |
| 5914 { | |
| 5915 if (*l == ':') | |
| 5916 { | |
| 5917 if (l[1] == ':') /* skip over "::" for C++ */ | |
| 5918 ++l; | |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
5919 else if (!cin_iscase(l + 1, FALSE)) |
| 7 | 5920 break; |
| 5921 } | |
| 5922 else if (*l == '\'' && l[1] && l[2] == '\'') | |
| 5923 l += 2; /* skip over 'x' */ | |
| 5924 } | |
| 5925 if (*l == NUL) | |
| 5926 return NULL; | |
| 5927 l = cin_skipcomment(l + 1); | |
| 5928 if (*l == NUL) | |
| 5929 return NULL; | |
| 5930 return l; | |
| 5931 } | |
| 5932 | |
| 5933 /* | |
| 5934 * Get indent of line "lnum", skipping a label. | |
| 5935 * Return 0 if there is nothing after the label. | |
| 5936 */ | |
| 5937 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5938 get_indent_nolabel (linenr_T lnum) /* XXX */ |
| 7 | 5939 { |
| 5940 char_u *l; | |
| 5941 pos_T fp; | |
| 5942 colnr_T col; | |
| 5943 char_u *p; | |
| 5944 | |
| 5945 l = ml_get(lnum); | |
| 5946 p = after_label(l); | |
| 5947 if (p == NULL) | |
| 5948 return 0; | |
| 5949 | |
| 5950 fp.col = (colnr_T)(p - l); | |
| 5951 fp.lnum = lnum; | |
| 5952 getvcol(curwin, &fp, &col, NULL, NULL); | |
| 5953 return (int)col; | |
| 5954 } | |
| 5955 | |
| 5956 /* | |
| 5957 * Find indent for line "lnum", ignoring any case or jump label. | |
| 829 | 5958 * Also return a pointer to the text (after the label) in "pp". |
| 7 | 5959 * label: if (asdf && asdfasdf) |
| 5960 * ^ | |
| 5961 */ | |
| 5962 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5963 skip_label(linenr_T lnum, char_u **pp) |
| 7 | 5964 { |
| 5965 char_u *l; | |
| 5966 int amount; | |
| 5967 pos_T cursor_save; | |
| 5968 | |
| 5969 cursor_save = curwin->w_cursor; | |
| 5970 curwin->w_cursor.lnum = lnum; | |
| 5971 l = ml_get_curline(); | |
| 5972 /* XXX */ | |
| 5442 | 5973 if (cin_iscase(l, FALSE) || cin_isscopedecl(l) || cin_islabel()) |
| 7 | 5974 { |
| 5975 amount = get_indent_nolabel(lnum); | |
| 5976 l = after_label(ml_get_curline()); | |
| 5977 if (l == NULL) /* just in case */ | |
| 5978 l = ml_get_curline(); | |
| 5979 } | |
| 5980 else | |
| 5981 { | |
| 5982 amount = get_indent(); | |
| 5983 l = ml_get_curline(); | |
| 5984 } | |
| 5985 *pp = l; | |
| 5986 | |
| 5987 curwin->w_cursor = cursor_save; | |
| 5988 return amount; | |
| 5989 } | |
| 5990 | |
| 5991 /* | |
| 5992 * Return the indent of the first variable name after a type in a declaration. | |
| 5993 * int a, indent of "a" | |
| 5994 * static struct foo b, indent of "b" | |
| 5995 * enum bla c, indent of "c" | |
| 5996 * Returns zero when it doesn't look like a declaration. | |
| 5997 */ | |
| 5998 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
5999 cin_first_id_amount(void) |
| 7 | 6000 { |
| 6001 char_u *line, *p, *s; | |
| 6002 int len; | |
| 6003 pos_T fp; | |
| 6004 colnr_T col; | |
| 6005 | |
| 6006 line = ml_get_curline(); | |
| 6007 p = skipwhite(line); | |
| 835 | 6008 len = (int)(skiptowhite(p) - p); |
| 7 | 6009 if (len == 6 && STRNCMP(p, "static", 6) == 0) |
| 6010 { | |
| 6011 p = skipwhite(p + 6); | |
| 856 | 6012 len = (int)(skiptowhite(p) - p); |
| 7 | 6013 } |
| 6014 if (len == 6 && STRNCMP(p, "struct", 6) == 0) | |
| 6015 p = skipwhite(p + 6); | |
| 6016 else if (len == 4 && STRNCMP(p, "enum", 4) == 0) | |
| 6017 p = skipwhite(p + 4); | |
| 6018 else if ((len == 8 && STRNCMP(p, "unsigned", 8) == 0) | |
| 6019 || (len == 6 && STRNCMP(p, "signed", 6) == 0)) | |
| 6020 { | |
| 6021 s = skipwhite(p + len); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6022 if ((STRNCMP(s, "int", 3) == 0 && VIM_ISWHITE(s[3])) |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6023 || (STRNCMP(s, "long", 4) == 0 && VIM_ISWHITE(s[4])) |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6024 || (STRNCMP(s, "short", 5) == 0 && VIM_ISWHITE(s[5])) |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6025 || (STRNCMP(s, "char", 4) == 0 && VIM_ISWHITE(s[4]))) |
| 7 | 6026 p = s; |
| 6027 } | |
| 6028 for (len = 0; vim_isIDc(p[len]); ++len) | |
| 6029 ; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6030 if (len == 0 || !VIM_ISWHITE(p[len]) || cin_nocode(p)) |
| 7 | 6031 return 0; |
| 6032 | |
| 6033 p = skipwhite(p + len); | |
| 6034 fp.lnum = curwin->w_cursor.lnum; | |
| 6035 fp.col = (colnr_T)(p - line); | |
| 6036 getvcol(curwin, &fp, &col, NULL, NULL); | |
| 6037 return (int)col; | |
| 6038 } | |
| 6039 | |
| 6040 /* | |
| 6041 * Return the indent of the first non-blank after an equal sign. | |
| 6042 * char *foo = "here"; | |
| 6043 * Return zero if no (useful) equal sign found. | |
| 6044 * Return -1 if the line above "lnum" ends in a backslash. | |
| 6045 * foo = "asdf\ | |
| 6046 * asdf\ | |
| 6047 * here"; | |
| 6048 */ | |
| 6049 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6050 cin_get_equal_amount(linenr_T lnum) |
| 7 | 6051 { |
| 6052 char_u *line; | |
| 6053 char_u *s; | |
| 6054 colnr_T col; | |
| 6055 pos_T fp; | |
| 6056 | |
| 6057 if (lnum > 1) | |
| 6058 { | |
| 6059 line = ml_get(lnum - 1); | |
| 6060 if (*line != NUL && line[STRLEN(line) - 1] == '\\') | |
| 6061 return -1; | |
| 6062 } | |
| 6063 | |
| 6064 line = s = ml_get(lnum); | |
| 6065 while (*s != NUL && vim_strchr((char_u *)"=;{}\"'", *s) == NULL) | |
| 6066 { | |
| 6067 if (cin_iscomment(s)) /* ignore comments */ | |
| 6068 s = cin_skipcomment(s); | |
| 6069 else | |
| 6070 ++s; | |
| 6071 } | |
| 6072 if (*s != '=') | |
| 6073 return 0; | |
| 6074 | |
| 6075 s = skipwhite(s + 1); | |
| 6076 if (cin_nocode(s)) | |
| 6077 return 0; | |
| 6078 | |
| 6079 if (*s == '"') /* nice alignment for continued strings */ | |
| 6080 ++s; | |
| 6081 | |
| 6082 fp.lnum = lnum; | |
| 6083 fp.col = (colnr_T)(s - line); | |
| 6084 getvcol(curwin, &fp, &col, NULL, NULL); | |
| 6085 return (int)col; | |
| 6086 } | |
| 6087 | |
| 6088 /* | |
| 6089 * Recognize a preprocessor statement: Any line that starts with '#'. | |
| 6090 */ | |
| 6091 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6092 cin_ispreproc(char_u *s) |
| 7 | 6093 { |
| 2776 | 6094 if (*skipwhite(s) == '#') |
| 7 | 6095 return TRUE; |
| 6096 return FALSE; | |
| 6097 } | |
| 6098 | |
| 6099 /* | |
| 6100 * Return TRUE if line "*pp" at "*lnump" is a preprocessor statement or a | |
| 6101 * continuation line of a preprocessor statement. Decrease "*lnump" to the | |
| 6102 * start and return the line in "*pp". | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6103 * Put the amount of indent in "*amount". |
| 7 | 6104 */ |
| 6105 static int | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6106 cin_ispreproc_cont(char_u **pp, linenr_T *lnump, int *amount) |
| 7 | 6107 { |
| 6108 char_u *line = *pp; | |
| 6109 linenr_T lnum = *lnump; | |
| 6110 int retval = FALSE; | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6111 int candidate_amount = *amount; |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6112 |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6113 if (*line != NUL && line[STRLEN(line) - 1] == '\\') |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6114 candidate_amount = get_indent_lnum(lnum); |
| 7 | 6115 |
| 408 | 6116 for (;;) |
| 7 | 6117 { |
| 6118 if (cin_ispreproc(line)) | |
| 6119 { | |
| 6120 retval = TRUE; | |
| 6121 *lnump = lnum; | |
| 6122 break; | |
| 6123 } | |
| 6124 if (lnum == 1) | |
| 6125 break; | |
| 6126 line = ml_get(--lnum); | |
| 6127 if (*line == NUL || line[STRLEN(line) - 1] != '\\') | |
| 6128 break; | |
| 6129 } | |
| 6130 | |
| 6131 if (lnum != *lnump) | |
| 6132 *pp = ml_get(*lnump); | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6133 if (retval) |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
6134 *amount = candidate_amount; |
| 7 | 6135 return retval; |
| 6136 } | |
| 6137 | |
| 6138 /* | |
| 6139 * Recognize the start of a C or C++ comment. | |
| 6140 */ | |
| 6141 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6142 cin_iscomment(char_u *p) |
| 7 | 6143 { |
| 6144 return (p[0] == '/' && (p[1] == '*' || p[1] == '/')); | |
| 6145 } | |
| 6146 | |
| 6147 /* | |
| 6148 * Recognize the start of a "//" comment. | |
| 6149 */ | |
| 6150 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6151 cin_islinecomment(char_u *p) |
| 7 | 6152 { |
| 6153 return (p[0] == '/' && p[1] == '/'); | |
| 6154 } | |
| 6155 | |
| 6156 /* | |
| 2805 | 6157 * Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or |
| 6158 * '}'. | |
| 7 | 6159 * Don't consider "} else" a terminated line. |
| 2843 | 6160 * If a line begins with an "else", only consider it terminated if no unmatched |
| 6161 * opening braces follow (handle "else { foo();" correctly). | |
| 7 | 6162 * Return the character terminating the line (ending char's have precedence if |
| 6163 * both apply in order to determine initializations). | |
| 6164 */ | |
| 6165 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6166 cin_isterminated( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6167 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6168 int incl_open, /* include '{' at the end as terminator */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6169 int incl_comma) /* recognize a trailing comma */ |
| 7 | 6170 { |
| 2843 | 6171 char_u found_start = 0; |
| 6172 unsigned n_open = 0; | |
| 6173 int is_else = FALSE; | |
| 7 | 6174 |
| 6175 s = cin_skipcomment(s); | |
| 6176 | |
| 6177 if (*s == '{' || (*s == '}' && !cin_iselse(s))) | |
| 6178 found_start = *s; | |
| 6179 | |
| 2843 | 6180 if (!found_start) |
| 6181 is_else = cin_iselse(s); | |
| 6182 | |
| 7 | 6183 while (*s) |
| 6184 { | |
| 6185 /* skip over comments, "" strings and 'c'haracters */ | |
| 6186 s = skip_string(cin_skipcomment(s)); | |
| 2805 | 6187 if (*s == '}' && n_open > 0) |
| 6188 --n_open; | |
| 2843 | 6189 if ((!is_else || n_open == 0) |
| 2805 | 6190 && (*s == ';' || *s == '}' || (incl_comma && *s == ',')) |
| 7 | 6191 && cin_nocode(s + 1)) |
| 6192 return *s; | |
| 2805 | 6193 else if (*s == '{') |
| 6194 { | |
| 6195 if (incl_open && cin_nocode(s + 1)) | |
| 6196 return *s; | |
| 6197 else | |
| 6198 ++n_open; | |
| 6199 } | |
| 7 | 6200 |
| 6201 if (*s) | |
| 6202 s++; | |
| 6203 } | |
| 6204 return found_start; | |
| 6205 } | |
| 6206 | |
| 6207 /* | |
| 6208 * Recognize the basic picture of a function declaration -- it needs to | |
| 6209 * have an open paren somewhere and a close paren at the end of the line and | |
| 6210 * no semicolons anywhere. | |
| 6211 * When a line ends in a comma we continue looking in the next line. | |
| 6212 * "sp" points to a string with the line. When looking at other lines it must | |
| 6213 * be restored to the line. When it's NULL fetch lines here. | |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6214 * "first_lnum" is where we start looking. |
| 3220 | 6215 * "min_lnum" is the line before which we will not be looking. |
| 7 | 6216 */ |
| 6217 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6218 cin_isfuncdecl( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6219 char_u **sp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6220 linenr_T first_lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6221 linenr_T min_lnum) |
| 7 | 6222 { |
| 6223 char_u *s; | |
| 6224 linenr_T lnum = first_lnum; | |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6225 linenr_T save_lnum = curwin->w_cursor.lnum; |
| 7 | 6226 int retval = FALSE; |
| 3220 | 6227 pos_T *trypos; |
| 6228 int just_started = TRUE; | |
| 7 | 6229 |
| 6230 if (sp == NULL) | |
| 6231 s = ml_get(lnum); | |
| 6232 else | |
| 6233 s = *sp; | |
| 6234 | |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6235 curwin->w_cursor.lnum = lnum; |
| 3220 | 6236 if (find_last_paren(s, '(', ')') |
| 5442 | 6237 && (trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) |
| 3220 | 6238 { |
| 6239 lnum = trypos->lnum; | |
| 6240 if (lnum < min_lnum) | |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6241 { |
|
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6242 curwin->w_cursor.lnum = save_lnum; |
| 3220 | 6243 return FALSE; |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6244 } |
| 3220 | 6245 |
| 6246 s = ml_get(lnum); | |
| 6247 } | |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6248 curwin->w_cursor.lnum = save_lnum; |
| 3220 | 6249 |
| 2776 | 6250 /* Ignore line starting with #. */ |
| 6251 if (cin_ispreproc(s)) | |
| 6252 return FALSE; | |
| 6253 | |
| 7 | 6254 while (*s && *s != '(' && *s != ';' && *s != '\'' && *s != '"') |
| 6255 { | |
| 6256 if (cin_iscomment(s)) /* ignore comments */ | |
| 6257 s = cin_skipcomment(s); | |
|
7206
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6258 else if (*s == ':') |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6259 { |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6260 if (*(s + 1) == ':') |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6261 s += 2; |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6262 else |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6263 /* To avoid a mistake in the following situation: |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6264 * A::A(int a, int b) |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6265 * : a(0) // <--not a function decl |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6266 * , b(0) |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6267 * {... |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6268 */ |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6269 return FALSE; |
|
c6a7305972fe
commit https://github.com/vim/vim/commit/e01f4f86cef7bed3cb99b26f9f57d86f6eb5fe1a
Christian Brabandt <cb@256bit.org>
parents:
7186
diff
changeset
|
6270 } |
| 7 | 6271 else |
| 6272 ++s; | |
| 6273 } | |
| 6274 if (*s != '(') | |
| 6275 return FALSE; /* ';', ' or " before any () or no '(' */ | |
| 6276 | |
| 6277 while (*s && *s != ';' && *s != '\'' && *s != '"') | |
| 6278 { | |
| 6279 if (*s == ')' && cin_nocode(s + 1)) | |
| 6280 { | |
| 6281 /* ')' at the end: may have found a match | |
| 6282 * Check for he previous line not to end in a backslash: | |
| 6283 * #if defined(x) && \ | |
| 6284 * defined(y) | |
| 6285 */ | |
| 6286 lnum = first_lnum - 1; | |
| 6287 s = ml_get(lnum); | |
| 6288 if (*s == NUL || s[STRLEN(s) - 1] != '\\') | |
| 6289 retval = TRUE; | |
| 6290 goto done; | |
| 6291 } | |
| 2776 | 6292 if ((*s == ',' && cin_nocode(s + 1)) || s[1] == NUL || cin_nocode(s)) |
| 6293 { | |
| 6294 int comma = (*s == ','); | |
| 6295 | |
| 6296 /* ',' at the end: continue looking in the next line. | |
| 6297 * At the end: check for ',' in the next line, for this style: | |
| 6298 * func(arg1 | |
| 6299 * , arg2) */ | |
| 6300 for (;;) | |
| 6301 { | |
| 6302 if (lnum >= curbuf->b_ml.ml_line_count) | |
| 6303 break; | |
| 6304 s = ml_get(++lnum); | |
| 6305 if (!cin_ispreproc(s)) | |
| 6306 break; | |
| 6307 } | |
| 7 | 6308 if (lnum >= curbuf->b_ml.ml_line_count) |
| 6309 break; | |
| 2776 | 6310 /* Require a comma at end of the line or a comma or ')' at the |
| 6311 * start of next line. */ | |
| 6312 s = skipwhite(s); | |
| 3220 | 6313 if (!just_started && (!comma && *s != ',' && *s != ')')) |
| 2776 | 6314 break; |
| 3220 | 6315 just_started = FALSE; |
| 7 | 6316 } |
| 6317 else if (cin_iscomment(s)) /* ignore comments */ | |
| 6318 s = cin_skipcomment(s); | |
| 6319 else | |
| 3220 | 6320 { |
| 7 | 6321 ++s; |
| 3220 | 6322 just_started = FALSE; |
| 6323 } | |
| 7 | 6324 } |
| 6325 | |
| 6326 done: | |
| 6327 if (lnum != first_lnum && sp != NULL) | |
| 6328 *sp = ml_get(first_lnum); | |
| 6329 | |
| 6330 return retval; | |
| 6331 } | |
| 6332 | |
| 6333 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6334 cin_isif(char_u *p) |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6335 { |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6336 return (STRNCMP(p, "if", 2) == 0 && !vim_isIDc(p[2])); |
| 7 | 6337 } |
| 6338 | |
| 6339 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6340 cin_iselse( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6341 char_u *p) |
| 7 | 6342 { |
| 6343 if (*p == '}') /* accept "} else" */ | |
| 6344 p = cin_skipcomment(p + 1); | |
| 6345 return (STRNCMP(p, "else", 4) == 0 && !vim_isIDc(p[4])); | |
| 6346 } | |
| 6347 | |
| 6348 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6349 cin_isdo(char_u *p) |
| 7 | 6350 { |
| 6351 return (STRNCMP(p, "do", 2) == 0 && !vim_isIDc(p[2])); | |
| 6352 } | |
| 6353 | |
| 6354 /* | |
| 6355 * Check if this is a "while" that should have a matching "do". | |
| 6356 * We only accept a "while (condition) ;", with only white space between the | |
| 6357 * ')' and ';'. The condition may be spread over several lines. | |
| 6358 */ | |
| 6359 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6360 cin_iswhileofdo (char_u *p, linenr_T lnum) /* XXX */ |
| 7 | 6361 { |
| 6362 pos_T cursor_save; | |
| 6363 pos_T *trypos; | |
| 6364 int retval = FALSE; | |
| 6365 | |
| 6366 p = cin_skipcomment(p); | |
| 6367 if (*p == '}') /* accept "} while (cond);" */ | |
| 6368 p = cin_skipcomment(p + 1); | |
| 4184 | 6369 if (cin_starts_with(p, "while")) |
| 7 | 6370 { |
| 6371 cursor_save = curwin->w_cursor; | |
| 6372 curwin->w_cursor.lnum = lnum; | |
| 6373 curwin->w_cursor.col = 0; | |
| 6374 p = ml_get_curline(); | |
| 6375 while (*p && *p != 'w') /* skip any '}', until the 'w' of the "while" */ | |
| 6376 { | |
| 6377 ++p; | |
| 6378 ++curwin->w_cursor.col; | |
| 6379 } | |
| 5442 | 6380 if ((trypos = findmatchlimit(NULL, 0, 0, |
| 6381 curbuf->b_ind_maxparen)) != NULL | |
| 7 | 6382 && *cin_skipcomment(ml_get_pos(trypos) + 1) == ';') |
| 6383 retval = TRUE; | |
| 6384 curwin->w_cursor = cursor_save; | |
| 6385 } | |
| 6386 return retval; | |
| 6387 } | |
| 6388 | |
| 829 | 6389 /* |
| 3461 | 6390 * Check whether in "p" there is an "if", "for" or "while" before "*poffset". |
| 3454 | 6391 * Return 0 if there is none. |
| 6392 * Otherwise return !0 and update "*poffset" to point to the place where the | |
| 6393 * string was found. | |
| 6394 */ | |
| 6395 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6396 cin_is_if_for_while_before_offset(char_u *line, int *poffset) |
| 3454 | 6397 { |
| 3461 | 6398 int offset = *poffset; |
| 3454 | 6399 |
| 6400 if (offset-- < 2) | |
| 6401 return 0; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6402 while (offset > 2 && VIM_ISWHITE(line[offset])) |
| 3454 | 6403 --offset; |
| 6404 | |
| 6405 offset -= 1; | |
| 6406 if (!STRNCMP(line + offset, "if", 2)) | |
| 6407 goto probablyFound; | |
| 6408 | |
| 6409 if (offset >= 1) | |
| 6410 { | |
| 6411 offset -= 1; | |
| 6412 if (!STRNCMP(line + offset, "for", 3)) | |
| 6413 goto probablyFound; | |
| 6414 | |
| 6415 if (offset >= 2) | |
| 6416 { | |
| 6417 offset -= 2; | |
| 6418 if (!STRNCMP(line + offset, "while", 5)) | |
| 6419 goto probablyFound; | |
| 6420 } | |
| 6421 } | |
| 6422 return 0; | |
| 3461 | 6423 |
| 3454 | 6424 probablyFound: |
| 6425 if (!offset || !vim_isIDc(line[offset - 1])) | |
| 6426 { | |
| 6427 *poffset = offset; | |
| 6428 return 1; | |
| 6429 } | |
| 6430 return 0; | |
| 6431 } | |
| 6432 | |
| 6433 /* | |
| 829 | 6434 * Return TRUE if we are at the end of a do-while. |
| 6435 * do | |
| 6436 * nothing; | |
| 6437 * while (foo | |
| 856 | 6438 * && bar); <-- here |
| 829 | 6439 * Adjust the cursor to the line with "while". |
| 6440 */ | |
| 6441 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6442 cin_iswhileofdo_end(int terminated) |
| 829 | 6443 { |
| 6444 char_u *line; | |
| 6445 char_u *p; | |
| 6446 char_u *s; | |
| 6447 pos_T *trypos; | |
| 6448 int i; | |
| 6449 | |
| 6450 if (terminated != ';') /* there must be a ';' at the end */ | |
| 6451 return FALSE; | |
| 6452 | |
| 6453 p = line = ml_get_curline(); | |
| 6454 while (*p != NUL) | |
| 6455 { | |
| 6456 p = cin_skipcomment(p); | |
| 6457 if (*p == ')') | |
| 6458 { | |
| 6459 s = skipwhite(p + 1); | |
| 6460 if (*s == ';' && cin_nocode(s + 1)) | |
| 6461 { | |
| 6462 /* Found ");" at end of the line, now check there is "while" | |
| 6463 * before the matching '('. XXX */ | |
| 835 | 6464 i = (int)(p - line); |
| 829 | 6465 curwin->w_cursor.col = i; |
| 5442 | 6466 trypos = find_match_paren(curbuf->b_ind_maxparen); |
| 829 | 6467 if (trypos != NULL) |
| 6468 { | |
| 6469 s = cin_skipcomment(ml_get(trypos->lnum)); | |
| 6470 if (*s == '}') /* accept "} while (cond);" */ | |
| 6471 s = cin_skipcomment(s + 1); | |
| 4184 | 6472 if (cin_starts_with(s, "while")) |
| 829 | 6473 { |
| 6474 curwin->w_cursor.lnum = trypos->lnum; | |
| 6475 return TRUE; | |
| 6476 } | |
| 6477 } | |
| 6478 | |
| 6479 /* Searching may have made "line" invalid, get it again. */ | |
| 6480 line = ml_get_curline(); | |
| 6481 p = line + i; | |
| 6482 } | |
| 6483 } | |
| 6484 if (*p != NUL) | |
| 6485 ++p; | |
| 6486 } | |
| 6487 return FALSE; | |
| 6488 } | |
| 6489 | |
| 7 | 6490 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6491 cin_isbreak(char_u *p) |
| 7 | 6492 { |
| 6493 return (STRNCMP(p, "break", 5) == 0 && !vim_isIDc(p[5])); | |
| 6494 } | |
| 6495 | |
| 828 | 6496 /* |
| 6497 * Find the position of a C++ base-class declaration or | |
| 7 | 6498 * constructor-initialization. eg: |
| 6499 * | |
| 6500 * class MyClass : | |
| 6501 * baseClass <-- here | |
| 6502 * class MyClass : public baseClass, | |
| 6503 * anotherBaseClass <-- here (should probably lineup ??) | |
| 6504 * MyClass::MyClass(...) : | |
| 6505 * baseClass(...) <-- here (constructor-initialization) | |
| 827 | 6506 * |
| 6507 * This is a lot of guessing. Watch out for "cond ? func() : foo". | |
| 7 | 6508 */ |
| 6509 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6510 cin_is_cpp_baseclass( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6511 cpp_baseclass_cache_T *cached) /* input and output */ |
| 6803 | 6512 { |
| 6513 lpos_T *pos = &cached->lpos; /* find position */ | |
| 7 | 6514 char_u *s; |
| 6515 int class_or_struct, lookfor_ctor_init, cpp_base_class; | |
| 828 | 6516 linenr_T lnum = curwin->w_cursor.lnum; |
| 1336 | 6517 char_u *line = ml_get_curline(); |
| 7 | 6518 |
| 6803 | 6519 if (pos->lnum <= lnum) |
| 6520 return cached->found; /* Use the cached result */ | |
| 6521 | |
| 6522 pos->col = 0; | |
| 7 | 6523 |
| 17 | 6524 s = skipwhite(line); |
| 6525 if (*s == '#') /* skip #define FOO x ? (x) : x */ | |
| 6526 return FALSE; | |
| 6527 s = cin_skipcomment(s); | |
| 7 | 6528 if (*s == NUL) |
| 6529 return FALSE; | |
| 6530 | |
| 6531 cpp_base_class = lookfor_ctor_init = class_or_struct = FALSE; | |
| 6532 | |
| 828 | 6533 /* Search for a line starting with '#', empty, ending in ';' or containing |
| 6534 * '{' or '}' and start below it. This handles the following situations: | |
| 6535 * a = cond ? | |
| 6536 * func() : | |
| 856 | 6537 * asdf; |
| 828 | 6538 * func::foo() |
| 6539 * : something | |
| 6540 * {} | |
| 6541 * Foo::Foo (int one, int two) | |
| 6542 * : something(4), | |
| 6543 * somethingelse(3) | |
| 6544 * {} | |
| 6545 */ | |
| 6546 while (lnum > 1) | |
| 6547 { | |
| 1336 | 6548 line = ml_get(lnum - 1); |
| 6549 s = skipwhite(line); | |
| 828 | 6550 if (*s == '#' || *s == NUL) |
| 6551 break; | |
| 6552 while (*s != NUL) | |
| 6553 { | |
| 6554 s = cin_skipcomment(s); | |
| 6555 if (*s == '{' || *s == '}' | |
| 6556 || (*s == ';' && cin_nocode(s + 1))) | |
| 6557 break; | |
| 6558 if (*s != NUL) | |
| 6559 ++s; | |
| 6560 } | |
| 6561 if (*s != NUL) | |
| 6562 break; | |
| 6563 --lnum; | |
| 6564 } | |
| 6565 | |
| 6803 | 6566 pos->lnum = lnum; |
| 1336 | 6567 line = ml_get(lnum); |
|
7164
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6568 s = line; |
| 828 | 6569 for (;;) |
| 6570 { | |
| 6571 if (*s == NUL) | |
| 6572 { | |
| 6573 if (lnum == curwin->w_cursor.lnum) | |
| 6574 break; | |
| 6575 /* Continue in the cursor line. */ | |
| 1336 | 6576 line = ml_get(++lnum); |
|
7164
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6577 s = line; |
|
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6578 } |
|
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6579 if (s == line) |
|
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6580 { |
|
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6581 /* don't recognize "case (foo):" as a baseclass */ |
|
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6582 if (cin_iscase(s, FALSE)) |
|
d3c57e7f489a
commit https://github.com/vim/vim/commit/d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479
Christian Brabandt <cb@256bit.org>
parents:
7160
diff
changeset
|
6583 break; |
| 1336 | 6584 s = cin_skipcomment(line); |
| 6585 if (*s == NUL) | |
| 6586 continue; | |
| 828 | 6587 } |
| 6588 | |
| 6971 | 6589 if (s[0] == '"' || (s[0] == 'R' && s[1] == '"')) |
| 2807 | 6590 s = skip_string(s) + 1; |
| 6591 else if (s[0] == ':') | |
| 7 | 6592 { |
| 6593 if (s[1] == ':') | |
| 6594 { | |
| 6595 /* skip double colon. It can't be a constructor | |
| 6596 * initialization any more */ | |
| 6597 lookfor_ctor_init = FALSE; | |
| 6598 s = cin_skipcomment(s + 2); | |
| 6599 } | |
| 6600 else if (lookfor_ctor_init || class_or_struct) | |
| 6601 { | |
| 6602 /* we have something found, that looks like the start of | |
| 1532 | 6603 * cpp-base-class-declaration or constructor-initialization */ |
| 7 | 6604 cpp_base_class = TRUE; |
| 6605 lookfor_ctor_init = class_or_struct = FALSE; | |
| 6803 | 6606 pos->col = 0; |
| 7 | 6607 s = cin_skipcomment(s + 1); |
| 6608 } | |
| 6609 else | |
| 6610 s = cin_skipcomment(s + 1); | |
| 6611 } | |
| 6612 else if ((STRNCMP(s, "class", 5) == 0 && !vim_isIDc(s[5])) | |
| 6613 || (STRNCMP(s, "struct", 6) == 0 && !vim_isIDc(s[6]))) | |
| 6614 { | |
| 6615 class_or_struct = TRUE; | |
| 6616 lookfor_ctor_init = FALSE; | |
| 6617 | |
| 6618 if (*s == 'c') | |
| 6619 s = cin_skipcomment(s + 5); | |
| 6620 else | |
| 6621 s = cin_skipcomment(s + 6); | |
| 6622 } | |
| 6623 else | |
| 6624 { | |
| 6625 if (s[0] == '{' || s[0] == '}' || s[0] == ';') | |
| 6626 { | |
| 6627 cpp_base_class = lookfor_ctor_init = class_or_struct = FALSE; | |
| 6628 } | |
| 6629 else if (s[0] == ')') | |
| 6630 { | |
| 6631 /* Constructor-initialization is assumed if we come across | |
| 6632 * something like "):" */ | |
| 6633 class_or_struct = FALSE; | |
| 6634 lookfor_ctor_init = TRUE; | |
| 6635 } | |
| 827 | 6636 else if (s[0] == '?') |
| 6637 { | |
| 6638 /* Avoid seeing '() :' after '?' as constructor init. */ | |
| 6639 return FALSE; | |
| 6640 } | |
| 7 | 6641 else if (!vim_isIDc(s[0])) |
| 6642 { | |
| 6643 /* if it is not an identifier, we are wrong */ | |
| 6644 class_or_struct = FALSE; | |
| 6645 lookfor_ctor_init = FALSE; | |
| 6646 } | |
| 6803 | 6647 else if (pos->col == 0) |
| 7 | 6648 { |
| 6649 /* it can't be a constructor-initialization any more */ | |
| 6650 lookfor_ctor_init = FALSE; | |
| 6651 | |
| 6652 /* the first statement starts here: lineup with this one... */ | |
| 828 | 6653 if (cpp_base_class) |
| 6803 | 6654 pos->col = (colnr_T)(s - line); |
| 7 | 6655 } |
| 6656 | |
| 828 | 6657 /* When the line ends in a comma don't align with it. */ |
| 6658 if (lnum == curwin->w_cursor.lnum && *s == ',' && cin_nocode(s + 1)) | |
| 6803 | 6659 pos->col = 0; |
| 828 | 6660 |
| 7 | 6661 s = cin_skipcomment(s + 1); |
| 6662 } | |
| 6663 } | |
| 6664 | |
| 6803 | 6665 cached->found = cpp_base_class; |
| 6666 if (cpp_base_class) | |
| 6667 pos->lnum = lnum; | |
| 7 | 6668 return cpp_base_class; |
| 6669 } | |
| 6670 | |
| 828 | 6671 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6672 get_baseclass_amount(int col) |
| 828 | 6673 { |
| 6674 int amount; | |
| 6675 colnr_T vcol; | |
| 6676 pos_T *trypos; | |
| 6677 | |
| 6678 if (col == 0) | |
| 6679 { | |
| 6680 amount = get_indent(); | |
| 6681 if (find_last_paren(ml_get_curline(), '(', ')') | |
| 5442 | 6682 && (trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) |
| 828 | 6683 amount = get_indent_lnum(trypos->lnum); /* XXX */ |
| 6684 if (!cin_ends_in(ml_get_curline(), (char_u *)",", NULL)) | |
| 5442 | 6685 amount += curbuf->b_ind_cpp_baseclass; |
| 828 | 6686 } |
| 6687 else | |
| 6688 { | |
| 6689 curwin->w_cursor.col = col; | |
| 6690 getvcol(curwin, &curwin->w_cursor, &vcol, NULL, NULL); | |
| 6691 amount = (int)vcol; | |
| 6692 } | |
| 5442 | 6693 if (amount < curbuf->b_ind_cpp_baseclass) |
| 6694 amount = curbuf->b_ind_cpp_baseclass; | |
| 828 | 6695 return amount; |
| 6696 } | |
| 6697 | |
| 7 | 6698 /* |
| 6699 * Return TRUE if string "s" ends with the string "find", possibly followed by | |
| 6700 * white space and comments. Skip strings and comments. | |
| 6701 * Ignore "ignore" after "find" if it's not NULL. | |
| 6702 */ | |
| 6703 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6704 cin_ends_in(char_u *s, char_u *find, char_u *ignore) |
| 7 | 6705 { |
| 6706 char_u *p = s; | |
| 6707 char_u *r; | |
| 6708 int len = (int)STRLEN(find); | |
| 6709 | |
| 6710 while (*p != NUL) | |
| 6711 { | |
| 6712 p = cin_skipcomment(p); | |
| 6713 if (STRNCMP(p, find, len) == 0) | |
| 6714 { | |
| 6715 r = skipwhite(p + len); | |
| 6716 if (ignore != NULL && STRNCMP(r, ignore, STRLEN(ignore)) == 0) | |
| 6717 r = skipwhite(r + STRLEN(ignore)); | |
| 6718 if (cin_nocode(r)) | |
| 6719 return TRUE; | |
| 6720 } | |
| 6721 if (*p != NUL) | |
| 6722 ++p; | |
| 6723 } | |
| 6724 return FALSE; | |
| 6725 } | |
| 6726 | |
| 6727 /* | |
| 4184 | 6728 * Return TRUE when "s" starts with "word" and then a non-ID character. |
| 6729 */ | |
| 6730 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6731 cin_starts_with(char_u *s, char *word) |
| 4184 | 6732 { |
| 4207 | 6733 int l = (int)STRLEN(word); |
| 4184 | 6734 |
| 6735 return (STRNCMP(s, word, l) == 0 && !vim_isIDc(s[l])); | |
| 6736 } | |
| 6737 | |
| 6738 /* | |
| 7 | 6739 * Skip strings, chars and comments until at or past "trypos". |
| 6740 * Return the column found. | |
| 6741 */ | |
| 6742 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6743 cin_skip2pos(pos_T *trypos) |
| 7 | 6744 { |
| 6745 char_u *line; | |
| 6746 char_u *p; | |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
6747 char_u *new_p; |
| 7 | 6748 |
| 6749 p = line = ml_get(trypos->lnum); | |
| 6750 while (*p && (colnr_T)(p - line) < trypos->col) | |
| 6751 { | |
| 6752 if (cin_iscomment(p)) | |
| 6753 p = cin_skipcomment(p); | |
| 6754 else | |
| 6755 { | |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
6756 new_p = skip_string(p); |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
6757 if (new_p == p) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
6758 ++p; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
6759 else |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
6760 p = new_p; |
| 7 | 6761 } |
| 6762 } | |
| 6763 return (int)(p - line); | |
| 6764 } | |
| 6765 | |
| 6766 /* | |
| 6767 * Find the '{' at the start of the block we are in. | |
| 6768 * Return NULL if no match found. | |
| 6769 * Ignore a '{' that is in a comment, makes indenting the next three lines | |
| 6770 * work. */ | |
| 6771 /* foo() */ | |
| 6772 /* { */ | |
| 6773 /* } */ | |
| 6774 | |
| 6775 static pos_T * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6776 find_start_brace(void) /* XXX */ |
| 7 | 6777 { |
| 6778 pos_T cursor_save; | |
| 6779 pos_T *trypos; | |
| 6780 pos_T *pos; | |
| 6781 static pos_T pos_copy; | |
| 6782 | |
| 6783 cursor_save = curwin->w_cursor; | |
| 6784 while ((trypos = findmatchlimit(NULL, '{', FM_BLOCKSTOP, 0)) != NULL) | |
| 6785 { | |
| 6786 pos_copy = *trypos; /* copy pos_T, next findmatch will change it */ | |
| 6787 trypos = &pos_copy; | |
| 6788 curwin->w_cursor = *trypos; | |
| 6789 pos = NULL; | |
| 829 | 6790 /* ignore the { if it's in a // or / * * / comment */ |
| 7 | 6791 if ((colnr_T)cin_skip2pos(trypos) == trypos->col |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
6792 && (pos = ind_find_start_CORS(NULL)) == NULL) /* XXX */ |
| 7 | 6793 break; |
| 6794 if (pos != NULL) | |
| 6795 curwin->w_cursor.lnum = pos->lnum; | |
| 6796 } | |
| 6797 curwin->w_cursor = cursor_save; | |
| 6798 return trypos; | |
| 6799 } | |
| 6800 | |
| 6801 /* | |
| 6020 | 6802 * Find the matching '(', ignoring it if it is in a comment. |
| 3454 | 6803 * Return NULL if no match found. |
| 7 | 6804 */ |
| 6805 static pos_T * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6806 find_match_paren(int ind_maxparen) /* XXX */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6807 { |
|
10180
9b86db26d0e8
commit https://github.com/vim/vim/commit/80c3fd7c559c7d329d57afe10db9bfb0adf10e46
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
6808 return find_match_char('(', ind_maxparen); |
| 6030 | 6809 } |
| 6810 | |
| 6811 static pos_T * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6812 find_match_char (int c, int ind_maxparen) /* XXX */ |
| 6030 | 6813 { |
| 7 | 6814 pos_T cursor_save; |
| 6815 pos_T *trypos; | |
| 829 | 6816 static pos_T pos_copy; |
| 6691 | 6817 int ind_maxp_wk; |
| 7 | 6818 |
| 6819 cursor_save = curwin->w_cursor; | |
| 6691 | 6820 ind_maxp_wk = ind_maxparen; |
| 6821 retry: | |
| 6822 if ((trypos = findmatchlimit(NULL, c, 0, ind_maxp_wk)) != NULL) | |
| 7 | 6823 { |
| 6824 /* check if the ( is in a // comment */ | |
| 6825 if ((colnr_T)cin_skip2pos(trypos) > trypos->col) | |
| 6691 | 6826 { |
| 6827 ind_maxp_wk = ind_maxparen - (int)(cursor_save.lnum - trypos->lnum); | |
| 6828 if (ind_maxp_wk > 0) | |
| 6829 { | |
| 6830 curwin->w_cursor = *trypos; | |
| 6831 curwin->w_cursor.col = 0; /* XXX */ | |
| 6832 goto retry; | |
| 6833 } | |
| 7 | 6834 trypos = NULL; |
| 6691 | 6835 } |
| 7 | 6836 else |
| 6837 { | |
| 6691 | 6838 pos_T *trypos_wk; |
| 6839 | |
| 7 | 6840 pos_copy = *trypos; /* copy trypos, findmatch will change it */ |
| 6841 trypos = &pos_copy; | |
| 6842 curwin->w_cursor = *trypos; | |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
6843 if ((trypos_wk = ind_find_start_CORS(NULL)) != NULL) /* XXX */ |
| 6691 | 6844 { |
| 6845 ind_maxp_wk = ind_maxparen - (int)(cursor_save.lnum | |
| 6846 - trypos_wk->lnum); | |
| 6847 if (ind_maxp_wk > 0) | |
| 6848 { | |
| 6849 curwin->w_cursor = *trypos_wk; | |
| 6850 goto retry; | |
| 6851 } | |
| 7 | 6852 trypos = NULL; |
| 6691 | 6853 } |
| 7 | 6854 } |
| 6855 } | |
| 6856 curwin->w_cursor = cursor_save; | |
| 6857 return trypos; | |
| 6858 } | |
| 6859 | |
| 6860 /* | |
| 6020 | 6861 * Find the matching '(', ignoring it if it is in a comment or before an |
| 6862 * unmatched {. | |
| 6863 * Return NULL if no match found. | |
| 6864 */ | |
| 6865 static pos_T * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6866 find_match_paren_after_brace (int ind_maxparen) /* XXX */ |
| 6020 | 6867 { |
| 6868 pos_T *trypos = find_match_paren(ind_maxparen); | |
| 6869 | |
| 6870 if (trypos != NULL) | |
| 6871 { | |
| 6872 pos_T *tryposBrace = find_start_brace(); | |
| 6873 | |
| 6874 /* If both an unmatched '(' and '{' is found. Ignore the '(' | |
| 6875 * position if the '{' is further down. */ | |
| 6876 if (tryposBrace != NULL | |
| 6877 && (trypos->lnum != tryposBrace->lnum | |
| 6878 ? trypos->lnum < tryposBrace->lnum | |
| 6879 : trypos->col < tryposBrace->col)) | |
| 6880 trypos = NULL; | |
| 6881 } | |
| 6882 return trypos; | |
| 6883 } | |
| 6884 | |
| 6885 /* | |
| 7 | 6886 * Return ind_maxparen corrected for the difference in line number between the |
| 6887 * cursor position and "startpos". This makes sure that searching for a | |
| 6888 * matching paren above the cursor line doesn't find a match because of | |
| 6889 * looking a few lines further. | |
| 6890 */ | |
| 6891 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6892 corr_ind_maxparen(pos_T *startpos) |
| 7 | 6893 { |
| 6894 long n = (long)startpos->lnum - (long)curwin->w_cursor.lnum; | |
| 6895 | |
| 5442 | 6896 if (n > 0 && n < curbuf->b_ind_maxparen / 2) |
| 6897 return curbuf->b_ind_maxparen - (int)n; | |
| 6898 return curbuf->b_ind_maxparen; | |
| 7 | 6899 } |
| 6900 | |
| 6901 /* | |
| 6902 * Set w_cursor.col to the column number of the last unmatched ')' or '{' in | |
| 3172 | 6903 * line "l". "l" must point to the start of the line. |
| 7 | 6904 */ |
| 6905 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6906 find_last_paren(char_u *l, int start, int end) |
| 7 | 6907 { |
| 6908 int i; | |
| 6909 int retval = FALSE; | |
| 6910 int open_count = 0; | |
| 6911 | |
| 6912 curwin->w_cursor.col = 0; /* default is start of line */ | |
| 6913 | |
| 3172 | 6914 for (i = 0; l[i] != NUL; i++) |
| 7 | 6915 { |
| 6916 i = (int)(cin_skipcomment(l + i) - l); /* ignore parens in comments */ | |
| 6917 i = (int)(skip_string(l + i) - l); /* ignore parens in quotes */ | |
| 6918 if (l[i] == start) | |
| 6919 ++open_count; | |
| 6920 else if (l[i] == end) | |
| 6921 { | |
| 6922 if (open_count > 0) | |
| 6923 --open_count; | |
| 6924 else | |
| 6925 { | |
| 6926 curwin->w_cursor.col = i; | |
| 6927 retval = TRUE; | |
| 6928 } | |
| 6929 } | |
| 6930 } | |
| 6931 return retval; | |
| 6932 } | |
| 6933 | |
| 5438 | 6934 /* |
| 6935 * Parse 'cinoptions' and set the values in "curbuf". | |
| 6936 * Must be called when 'cinoptions', 'shiftwidth' and/or 'tabstop' changes. | |
| 6937 */ | |
| 6938 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
6939 parse_cino(buf_T *buf) |
| 5438 | 6940 { |
| 6941 char_u *p; | |
| 6942 char_u *l; | |
| 6943 char_u *digits; | |
| 6944 int n; | |
| 6945 int divider; | |
| 6946 int fraction = 0; | |
| 6947 int sw = (int)get_sw_value(buf); | |
| 7 | 6948 |
| 6949 /* | |
| 5438 | 6950 * Set the default values. |
| 7 | 6951 */ |
| 5438 | 6952 /* Spaces from a block's opening brace the prevailing indent for that |
| 6953 * block should be. */ | |
| 6954 buf->b_ind_level = sw; | |
| 6955 | |
| 6956 /* Spaces from the edge of the line an open brace that's at the end of a | |
| 6957 * line is imagined to be. */ | |
| 6958 buf->b_ind_open_imag = 0; | |
| 6959 | |
| 6960 /* Spaces from the prevailing indent for a line that is not preceded by | |
| 6961 * an opening brace. */ | |
| 6962 buf->b_ind_no_brace = 0; | |
| 6963 | |
| 6964 /* Column where the first { of a function should be located }. */ | |
| 6965 buf->b_ind_first_open = 0; | |
| 6966 | |
| 6967 /* Spaces from the prevailing indent a leftmost open brace should be | |
| 6968 * located. */ | |
| 6969 buf->b_ind_open_extra = 0; | |
| 6970 | |
| 6971 /* Spaces from the matching open brace (real location for one at the left | |
| 6972 * edge; imaginary location from one that ends a line) the matching close | |
| 6973 * brace should be located. */ | |
| 6974 buf->b_ind_close_extra = 0; | |
| 6975 | |
| 6976 /* Spaces from the edge of the line an open brace sitting in the leftmost | |
| 6977 * column is imagined to be. */ | |
| 6978 buf->b_ind_open_left_imag = 0; | |
| 6979 | |
| 6980 /* Spaces jump labels should be shifted to the left if N is non-negative, | |
| 6981 * otherwise the jump label will be put to column 1. */ | |
| 6982 buf->b_ind_jump_label = -1; | |
| 6983 | |
| 6984 /* Spaces from the switch() indent a "case xx" label should be located. */ | |
| 6985 buf->b_ind_case = sw; | |
| 6986 | |
| 6987 /* Spaces from the "case xx:" code after a switch() should be located. */ | |
| 6988 buf->b_ind_case_code = sw; | |
| 6989 | |
| 6990 /* Lineup break at end of case in switch() with case label. */ | |
| 6991 buf->b_ind_case_break = 0; | |
| 6992 | |
| 6993 /* Spaces from the class declaration indent a scope declaration label | |
| 6994 * should be located. */ | |
| 6995 buf->b_ind_scopedecl = sw; | |
| 6996 | |
| 6997 /* Spaces from the scope declaration label code should be located. */ | |
| 6998 buf->b_ind_scopedecl_code = sw; | |
| 6999 | |
| 7000 /* Amount K&R-style parameters should be indented. */ | |
| 7001 buf->b_ind_param = sw; | |
| 7002 | |
| 7003 /* Amount a function type spec should be indented. */ | |
| 7004 buf->b_ind_func_type = sw; | |
| 7005 | |
| 7006 /* Amount a cpp base class declaration or constructor initialization | |
| 7007 * should be indented. */ | |
| 7008 buf->b_ind_cpp_baseclass = sw; | |
| 7009 | |
| 7010 /* additional spaces beyond the prevailing indent a continuation line | |
| 7011 * should be located. */ | |
| 7012 buf->b_ind_continuation = sw; | |
| 7013 | |
| 7014 /* Spaces from the indent of the line with an unclosed parentheses. */ | |
| 7015 buf->b_ind_unclosed = sw * 2; | |
| 7016 | |
| 7017 /* Spaces from the indent of the line with an unclosed parentheses, which | |
| 7018 * itself is also unclosed. */ | |
| 7019 buf->b_ind_unclosed2 = sw; | |
| 7020 | |
| 7021 /* Suppress ignoring spaces from the indent of a line starting with an | |
| 7022 * unclosed parentheses. */ | |
| 7023 buf->b_ind_unclosed_noignore = 0; | |
| 7024 | |
| 7025 /* If the opening paren is the last nonwhite character on the line, and | |
| 7026 * b_ind_unclosed_wrapped is nonzero, use this indent relative to the outer | |
| 7027 * context (for very long lines). */ | |
| 7028 buf->b_ind_unclosed_wrapped = 0; | |
| 7029 | |
| 7030 /* Suppress ignoring white space when lining up with the character after | |
| 7031 * an unclosed parentheses. */ | |
| 7032 buf->b_ind_unclosed_whiteok = 0; | |
| 7033 | |
| 7034 /* Indent a closing parentheses under the line start of the matching | |
| 7035 * opening parentheses. */ | |
| 7036 buf->b_ind_matching_paren = 0; | |
| 7037 | |
| 7038 /* Indent a closing parentheses under the previous line. */ | |
| 7039 buf->b_ind_paren_prev = 0; | |
| 7040 | |
| 7041 /* Extra indent for comments. */ | |
| 7042 buf->b_ind_comment = 0; | |
| 7043 | |
| 7044 /* Spaces from the comment opener when there is nothing after it. */ | |
| 7045 buf->b_ind_in_comment = 3; | |
| 7046 | |
| 7047 /* Boolean: if non-zero, use b_ind_in_comment even if there is something | |
| 7048 * after the comment opener. */ | |
| 7049 buf->b_ind_in_comment2 = 0; | |
| 7050 | |
| 7051 /* Max lines to search for an open paren. */ | |
| 7052 buf->b_ind_maxparen = 20; | |
| 7053 | |
| 7054 /* Max lines to search for an open comment. */ | |
| 7055 buf->b_ind_maxcomment = 70; | |
| 7056 | |
| 7057 /* Handle braces for java code. */ | |
| 7058 buf->b_ind_java = 0; | |
| 7059 | |
| 7060 /* Not to confuse JS object properties with labels. */ | |
| 7061 buf->b_ind_js = 0; | |
| 7062 | |
| 7063 /* Handle blocked cases correctly. */ | |
| 7064 buf->b_ind_keep_case_label = 0; | |
| 7065 | |
| 7066 /* Handle C++ namespace. */ | |
| 7067 buf->b_ind_cpp_namespace = 0; | |
| 7068 | |
| 7069 /* Handle continuation lines containing conditions of if(), for() and | |
| 7070 * while(). */ | |
| 7071 buf->b_ind_if_for_while = 0; | |
| 7072 | |
|
11069
814126a34c9d
patch 8.0.0423: changing 'cinoptions' does not always work
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7073 /* indentation for # comments */ |
|
814126a34c9d
patch 8.0.0423: changing 'cinoptions' does not always work
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7074 buf->b_ind_hash_comment = 0; |
|
814126a34c9d
patch 8.0.0423: changing 'cinoptions' does not always work
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7075 |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
7076 /* Handle C++ extern "C" or "C++" */ |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
7077 buf->b_ind_cpp_extern_c = 0; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
7078 |
| 5438 | 7079 for (p = buf->b_p_cino; *p; ) |
| 7080 { | |
| 7081 l = p++; | |
| 7082 if (*p == '-') | |
| 7083 ++p; | |
| 7084 digits = p; /* remember where the digits start */ | |
| 7085 n = getdigits(&p); | |
| 7086 divider = 0; | |
| 7087 if (*p == '.') /* ".5s" means a fraction */ | |
| 7088 { | |
| 7089 fraction = atol((char *)++p); | |
| 7090 while (VIM_ISDIGIT(*p)) | |
| 7091 { | |
| 7092 ++p; | |
| 7093 if (divider) | |
| 7094 divider *= 10; | |
| 7095 else | |
| 7096 divider = 10; | |
| 7097 } | |
| 7098 } | |
| 7099 if (*p == 's') /* "2s" means two times 'shiftwidth' */ | |
| 7100 { | |
| 7101 if (p == digits) | |
| 7102 n = sw; /* just "s" is one 'shiftwidth' */ | |
| 7103 else | |
| 7104 { | |
| 7105 n *= sw; | |
| 7106 if (divider) | |
| 7107 n += (sw * fraction + divider / 2) / divider; | |
| 7108 } | |
| 7109 ++p; | |
| 7110 } | |
| 7111 if (l[1] == '-') | |
| 7112 n = -n; | |
| 7113 | |
| 7114 /* When adding an entry here, also update the default 'cinoptions' in | |
| 7115 * doc/indent.txt, and add explanation for it! */ | |
| 7116 switch (*l) | |
| 7117 { | |
| 7118 case '>': buf->b_ind_level = n; break; | |
| 7119 case 'e': buf->b_ind_open_imag = n; break; | |
| 7120 case 'n': buf->b_ind_no_brace = n; break; | |
| 7121 case 'f': buf->b_ind_first_open = n; break; | |
| 7122 case '{': buf->b_ind_open_extra = n; break; | |
| 7123 case '}': buf->b_ind_close_extra = n; break; | |
| 7124 case '^': buf->b_ind_open_left_imag = n; break; | |
| 7125 case 'L': buf->b_ind_jump_label = n; break; | |
| 7126 case ':': buf->b_ind_case = n; break; | |
| 7127 case '=': buf->b_ind_case_code = n; break; | |
| 7128 case 'b': buf->b_ind_case_break = n; break; | |
| 7129 case 'p': buf->b_ind_param = n; break; | |
| 7130 case 't': buf->b_ind_func_type = n; break; | |
| 7131 case '/': buf->b_ind_comment = n; break; | |
| 7132 case 'c': buf->b_ind_in_comment = n; break; | |
| 7133 case 'C': buf->b_ind_in_comment2 = n; break; | |
| 7134 case 'i': buf->b_ind_cpp_baseclass = n; break; | |
| 7135 case '+': buf->b_ind_continuation = n; break; | |
| 7136 case '(': buf->b_ind_unclosed = n; break; | |
| 7137 case 'u': buf->b_ind_unclosed2 = n; break; | |
| 7138 case 'U': buf->b_ind_unclosed_noignore = n; break; | |
| 7139 case 'W': buf->b_ind_unclosed_wrapped = n; break; | |
| 7140 case 'w': buf->b_ind_unclosed_whiteok = n; break; | |
| 7141 case 'm': buf->b_ind_matching_paren = n; break; | |
| 7142 case 'M': buf->b_ind_paren_prev = n; break; | |
| 7143 case ')': buf->b_ind_maxparen = n; break; | |
| 7144 case '*': buf->b_ind_maxcomment = n; break; | |
| 7145 case 'g': buf->b_ind_scopedecl = n; break; | |
| 7146 case 'h': buf->b_ind_scopedecl_code = n; break; | |
| 7147 case 'j': buf->b_ind_java = n; break; | |
| 7148 case 'J': buf->b_ind_js = n; break; | |
| 7149 case 'l': buf->b_ind_keep_case_label = n; break; | |
| 7150 case '#': buf->b_ind_hash_comment = n; break; | |
| 7151 case 'N': buf->b_ind_cpp_namespace = n; break; | |
| 7152 case 'k': buf->b_ind_if_for_while = n; break; | |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
7153 case 'E': buf->b_ind_cpp_extern_c = n; break; |
| 5438 | 7154 } |
| 7155 if (*p == ',') | |
| 7156 ++p; | |
| 7157 } | |
| 7158 } | |
| 7159 | |
| 6971 | 7160 /* |
| 7161 * Return the desired indent for C code. | |
| 7162 * Return -1 if the indent should be left alone (inside a raw string). | |
| 7163 */ | |
| 5438 | 7164 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
7165 get_c_indent(void) |
| 5438 | 7166 { |
| 7 | 7167 pos_T cur_curpos; |
| 7168 int amount; | |
| 7169 int scope_amount; | |
| 834 | 7170 int cur_amount = MAXCOL; |
| 7 | 7171 colnr_T col; |
| 7172 char_u *theline; | |
| 7173 char_u *linecopy; | |
| 7174 pos_T *trypos; | |
| 6971 | 7175 pos_T *comment_pos; |
| 7 | 7176 pos_T *tryposBrace = NULL; |
| 6971 | 7177 pos_T tryposCopy; |
| 7 | 7178 pos_T our_paren_pos; |
| 7179 char_u *start; | |
| 7180 int start_brace; | |
| 1532 | 7181 #define BRACE_IN_COL0 1 /* '{' is in column 0 */ |
| 7 | 7182 #define BRACE_AT_START 2 /* '{' is at start of line */ |
| 7183 #define BRACE_AT_END 3 /* '{' is at end of line */ | |
| 7184 linenr_T ourscope; | |
| 7185 char_u *l; | |
| 7186 char_u *look; | |
| 7187 char_u terminated; | |
| 7188 int lookfor; | |
| 7189 #define LOOKFOR_INITIAL 0 | |
| 7190 #define LOOKFOR_IF 1 | |
| 7191 #define LOOKFOR_DO 2 | |
| 7192 #define LOOKFOR_CASE 3 | |
| 7193 #define LOOKFOR_ANY 4 | |
| 7194 #define LOOKFOR_TERM 5 | |
| 7195 #define LOOKFOR_UNTERM 6 | |
| 7196 #define LOOKFOR_SCOPEDECL 7 | |
| 7197 #define LOOKFOR_NOBREAK 8 | |
| 7198 #define LOOKFOR_CPP_BASECLASS 9 | |
| 7199 #define LOOKFOR_ENUM_OR_INIT 10 | |
| 6030 | 7200 #define LOOKFOR_JS_KEY 11 |
| 6803 | 7201 #define LOOKFOR_COMMA 12 |
| 7 | 7202 |
| 7203 int whilelevel; | |
| 7204 linenr_T lnum; | |
| 7205 int n; | |
| 7206 int iscase; | |
| 7207 int lookfor_break; | |
| 2857 | 7208 int lookfor_cpp_namespace = FALSE; |
| 7 | 7209 int cont_amount = 0; /* amount for continuation line */ |
|
2328
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
7210 int original_line_islabel; |
| 3123 | 7211 int added_to_amount = 0; |
| 6030 | 7212 int js_cur_has_key = 0; |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
7213 linenr_T raw_string_start = 0; |
| 6803 | 7214 cpp_baseclass_cache_T cache_cpp_baseclass = { FALSE, { MAXLNUM, 0 } }; |
| 7 | 7215 |
| 5438 | 7216 /* make a copy, value is changed below */ |
| 7217 int ind_continuation = curbuf->b_ind_continuation; | |
| 7 | 7218 |
| 7219 /* remember where the cursor was when we started */ | |
| 7220 cur_curpos = curwin->w_cursor; | |
| 7221 | |
| 6971 | 7222 /* if we are at line 1 zero indent is fine, right? */ |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
7223 if (cur_curpos.lnum == 1) |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
7224 return 0; |
|
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
7225 |
| 7 | 7226 /* Get a copy of the current contents of the line. |
| 7227 * This is required, because only the most recent line obtained with | |
| 7228 * ml_get is valid! */ | |
| 7229 linecopy = vim_strsave(ml_get(cur_curpos.lnum)); | |
| 7230 if (linecopy == NULL) | |
| 7231 return 0; | |
| 7232 | |
| 7233 /* | |
| 7234 * In insert mode and the cursor is on a ')' truncate the line at the | |
| 7235 * cursor position. We don't want to line up with the matching '(' when | |
| 7236 * inserting new stuff. | |
| 7237 * For unknown reasons the cursor might be past the end of the line, thus | |
| 7238 * check for that. | |
| 7239 */ | |
| 7240 if ((State & INSERT) | |
| 1883 | 7241 && curwin->w_cursor.col < (colnr_T)STRLEN(linecopy) |
| 7 | 7242 && linecopy[curwin->w_cursor.col] == ')') |
| 7243 linecopy[curwin->w_cursor.col] = NUL; | |
| 7244 | |
| 7245 theline = skipwhite(linecopy); | |
| 7246 | |
| 7247 /* move the cursor to the start of the line */ | |
| 7248 | |
| 7249 curwin->w_cursor.col = 0; | |
| 7250 | |
| 5442 | 7251 original_line_islabel = cin_islabel(); /* XXX */ |
|
2328
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
7252 |
| 7 | 7253 /* |
| 6971 | 7254 * If we are inside a raw string don't change the indent. |
| 7255 * Ignore a raw string inside a comment. | |
| 7256 */ | |
| 7257 comment_pos = ind_find_start_comment(); | |
| 7258 if (comment_pos != NULL) | |
| 7259 { | |
| 7260 /* findmatchlimit() static pos is overwritten, make a copy */ | |
| 7261 tryposCopy = *comment_pos; | |
| 7262 comment_pos = &tryposCopy; | |
| 7263 } | |
| 7264 trypos = find_start_rawstring(curbuf->b_ind_maxcomment); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11087
diff
changeset
|
7265 if (trypos != NULL && (comment_pos == NULL |
|
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11087
diff
changeset
|
7266 || LT_POS(*trypos, *comment_pos))) |
| 6971 | 7267 { |
| 7268 amount = -1; | |
| 7269 goto laterend; | |
| 7270 } | |
| 7271 | |
| 7272 /* | |
| 7 | 7273 * #defines and so on always go at the left when included in 'cinkeys'. |
| 7274 */ | |
| 7275 if (*theline == '#' && (*linecopy == '#' || in_cinkeys('#', ' ', TRUE))) | |
| 6971 | 7276 { |
| 5438 | 7277 amount = curbuf->b_ind_hash_comment; |
| 6971 | 7278 goto theend; |
| 7279 } | |
| 7 | 7280 |
| 7281 /* | |
|
2328
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
7282 * Is it a non-case label? Then that goes at the left margin too unless: |
|
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
7283 * - JS flag is set. |
|
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
7284 * - 'L' item has a positive value. |
| 7 | 7285 */ |
| 6971 | 7286 if (original_line_islabel && !curbuf->b_ind_js |
| 5438 | 7287 && curbuf->b_ind_jump_label < 0) |
| 7 | 7288 { |
| 7289 amount = 0; | |
| 6971 | 7290 goto theend; |
| 7 | 7291 } |
| 7292 | |
| 7293 /* | |
| 7294 * If we're inside a "//" comment and there is a "//" comment in a | |
| 7295 * previous line, lineup with that one. | |
| 7296 */ | |
| 6971 | 7297 if (cin_islinecomment(theline) |
| 7 | 7298 && (trypos = find_line_comment()) != NULL) /* XXX */ |
| 7299 { | |
| 7300 /* find how indented the line beginning the comment is */ | |
| 7301 getvcol(curwin, trypos, &col, NULL, NULL); | |
| 7302 amount = col; | |
| 6971 | 7303 goto theend; |
| 7 | 7304 } |
| 7305 | |
| 7306 /* | |
| 7307 * If we're inside a comment and not looking at the start of the | |
| 7308 * comment, try using the 'comments' option. | |
| 7309 */ | |
| 6971 | 7310 if (!cin_iscomment(theline) && comment_pos != NULL) /* XXX */ |
| 7 | 7311 { |
| 7312 int lead_start_len = 2; | |
| 7313 int lead_middle_len = 1; | |
| 7314 char_u lead_start[COM_MAX_LEN]; /* start-comment string */ | |
| 7315 char_u lead_middle[COM_MAX_LEN]; /* middle-comment string */ | |
| 7316 char_u lead_end[COM_MAX_LEN]; /* end-comment string */ | |
| 7317 char_u *p; | |
| 7318 int start_align = 0; | |
| 7319 int start_off = 0; | |
| 7320 int done = FALSE; | |
| 7321 | |
| 7322 /* find how indented the line beginning the comment is */ | |
| 6971 | 7323 getvcol(curwin, comment_pos, &col, NULL, NULL); |
| 7 | 7324 amount = col; |
| 2764 | 7325 *lead_start = NUL; |
| 7326 *lead_middle = NUL; | |
| 7 | 7327 |
| 7328 p = curbuf->b_p_com; | |
| 7329 while (*p != NUL) | |
| 7330 { | |
| 7331 int align = 0; | |
| 7332 int off = 0; | |
| 7333 int what = 0; | |
| 7334 | |
| 7335 while (*p != NUL && *p != ':') | |
| 7336 { | |
| 7337 if (*p == COM_START || *p == COM_END || *p == COM_MIDDLE) | |
| 7338 what = *p++; | |
| 7339 else if (*p == COM_LEFT || *p == COM_RIGHT) | |
| 7340 align = *p++; | |
| 7341 else if (VIM_ISDIGIT(*p) || *p == '-') | |
| 7342 off = getdigits(&p); | |
| 7343 else | |
| 7344 ++p; | |
| 7345 } | |
| 7346 | |
| 7347 if (*p == ':') | |
| 7348 ++p; | |
| 7349 (void)copy_option_part(&p, lead_end, COM_MAX_LEN, ","); | |
| 7350 if (what == COM_START) | |
| 7351 { | |
| 7352 STRCPY(lead_start, lead_end); | |
| 7353 lead_start_len = (int)STRLEN(lead_start); | |
| 7354 start_off = off; | |
| 7355 start_align = align; | |
| 7356 } | |
| 7357 else if (what == COM_MIDDLE) | |
| 7358 { | |
| 7359 STRCPY(lead_middle, lead_end); | |
| 7360 lead_middle_len = (int)STRLEN(lead_middle); | |
| 7361 } | |
| 7362 else if (what == COM_END) | |
| 7363 { | |
| 7364 /* If our line starts with the middle comment string, line it | |
| 7365 * up with the comment opener per the 'comments' option. */ | |
| 7366 if (STRNCMP(theline, lead_middle, lead_middle_len) == 0 | |
| 7367 && STRNCMP(theline, lead_end, STRLEN(lead_end)) != 0) | |
| 7368 { | |
| 7369 done = TRUE; | |
| 7370 if (curwin->w_cursor.lnum > 1) | |
| 7371 { | |
| 7372 /* If the start comment string matches in the previous | |
| 1532 | 7373 * line, use the indent of that line plus offset. If |
| 7 | 7374 * the middle comment string matches in the previous |
| 7375 * line, use the indent of that line. XXX */ | |
| 7376 look = skipwhite(ml_get(curwin->w_cursor.lnum - 1)); | |
| 7377 if (STRNCMP(look, lead_start, lead_start_len) == 0) | |
| 7378 amount = get_indent_lnum(curwin->w_cursor.lnum - 1); | |
| 7379 else if (STRNCMP(look, lead_middle, | |
| 7380 lead_middle_len) == 0) | |
| 7381 { | |
| 7382 amount = get_indent_lnum(curwin->w_cursor.lnum - 1); | |
| 7383 break; | |
| 7384 } | |
| 7385 /* If the start comment string doesn't match with the | |
| 7386 * start of the comment, skip this entry. XXX */ | |
| 6971 | 7387 else if (STRNCMP(ml_get(comment_pos->lnum) + comment_pos->col, |
| 7 | 7388 lead_start, lead_start_len) != 0) |
| 7389 continue; | |
| 7390 } | |
| 7391 if (start_off != 0) | |
| 7392 amount += start_off; | |
| 7393 else if (start_align == COM_RIGHT) | |
| 17 | 7394 amount += vim_strsize(lead_start) |
| 7395 - vim_strsize(lead_middle); | |
| 7 | 7396 break; |
| 7397 } | |
| 7398 | |
| 7399 /* If our line starts with the end comment string, line it up | |
| 7400 * with the middle comment */ | |
| 7401 if (STRNCMP(theline, lead_middle, lead_middle_len) != 0 | |
| 7402 && STRNCMP(theline, lead_end, STRLEN(lead_end)) == 0) | |
| 7403 { | |
| 7404 amount = get_indent_lnum(curwin->w_cursor.lnum - 1); | |
| 7405 /* XXX */ | |
| 7406 if (off != 0) | |
| 7407 amount += off; | |
| 7408 else if (align == COM_RIGHT) | |
| 17 | 7409 amount += vim_strsize(lead_start) |
| 7410 - vim_strsize(lead_middle); | |
| 7 | 7411 done = TRUE; |
| 7412 break; | |
| 7413 } | |
| 7414 } | |
| 7415 } | |
| 7416 | |
| 7417 /* If our line starts with an asterisk, line up with the | |
| 7418 * asterisk in the comment opener; otherwise, line up | |
| 7419 * with the first character of the comment text. | |
| 7420 */ | |
| 7421 if (done) | |
| 7422 ; | |
| 7423 else if (theline[0] == '*') | |
| 7424 amount += 1; | |
| 7425 else | |
| 7426 { | |
| 7427 /* | |
| 7428 * If we are more than one line away from the comment opener, take | |
| 7429 * the indent of the previous non-empty line. If 'cino' has "CO" | |
| 7430 * and we are just below the comment opener and there are any | |
| 7431 * white characters after it line up with the text after it; | |
| 7432 * otherwise, add the amount specified by "c" in 'cino' | |
| 7433 */ | |
| 7434 amount = -1; | |
| 6971 | 7435 for (lnum = cur_curpos.lnum - 1; lnum > comment_pos->lnum; --lnum) |
| 7 | 7436 { |
| 7437 if (linewhite(lnum)) /* skip blank lines */ | |
| 7438 continue; | |
| 7439 amount = get_indent_lnum(lnum); /* XXX */ | |
| 7440 break; | |
| 7441 } | |
| 7442 if (amount == -1) /* use the comment opener */ | |
| 7443 { | |
| 5438 | 7444 if (!curbuf->b_ind_in_comment2) |
| 7 | 7445 { |
| 6971 | 7446 start = ml_get(comment_pos->lnum); |
| 7447 look = start + comment_pos->col + 2; /* skip / and * */ | |
| 7 | 7448 if (*look != NUL) /* if something after it */ |
| 6971 | 7449 comment_pos->col = (colnr_T)(skipwhite(look) - start); |
| 7 | 7450 } |
| 6971 | 7451 getvcol(curwin, comment_pos, &col, NULL, NULL); |
| 7 | 7452 amount = col; |
| 5438 | 7453 if (curbuf->b_ind_in_comment2 || *look == NUL) |
| 7454 amount += curbuf->b_ind_in_comment; | |
| 7 | 7455 } |
| 7456 } | |
| 6971 | 7457 goto theend; |
| 7 | 7458 } |
| 7459 | |
| 7460 /* | |
| 6030 | 7461 * Are we looking at a ']' that has a match? |
| 7462 */ | |
| 6971 | 7463 if (*skipwhite(theline) == ']' |
| 6030 | 7464 && (trypos = find_match_char('[', curbuf->b_ind_maxparen)) != NULL) |
| 7465 { | |
| 7466 /* align with the line containing the '['. */ | |
| 7467 amount = get_indent_lnum(trypos->lnum); | |
| 6971 | 7468 goto theend; |
| 6030 | 7469 } |
| 7470 | |
| 7471 /* | |
| 7 | 7472 * Are we inside parentheses or braces? |
| 7473 */ /* XXX */ | |
| 6971 | 7474 if (((trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL |
| 5438 | 7475 && curbuf->b_ind_java == 0) |
| 5442 | 7476 || (tryposBrace = find_start_brace()) != NULL |
| 7 | 7477 || trypos != NULL) |
| 7478 { | |
| 7479 if (trypos != NULL && tryposBrace != NULL) | |
| 7480 { | |
| 7481 /* Both an unmatched '(' and '{' is found. Use the one which is | |
| 7482 * closer to the current cursor position, set the other to NULL. */ | |
| 7483 if (trypos->lnum != tryposBrace->lnum | |
| 7484 ? trypos->lnum < tryposBrace->lnum | |
| 7485 : trypos->col < tryposBrace->col) | |
| 7486 trypos = NULL; | |
| 7487 else | |
| 7488 tryposBrace = NULL; | |
| 7489 } | |
| 7490 | |
| 7491 if (trypos != NULL) | |
| 7492 { | |
| 7493 /* | |
| 7494 * If the matching paren is more than one line away, use the indent of | |
| 7495 * a previous non-empty line that matches the same paren. | |
| 7496 */ | |
| 5438 | 7497 if (theline[0] == ')' && curbuf->b_ind_paren_prev) |
| 829 | 7498 { |
| 7499 /* Line up with the start of the matching paren line. */ | |
| 7500 amount = get_indent_lnum(curwin->w_cursor.lnum - 1); /* XXX */ | |
| 7501 } | |
| 7502 else | |
| 7503 { | |
| 7504 amount = -1; | |
| 7505 our_paren_pos = *trypos; | |
| 7506 for (lnum = cur_curpos.lnum - 1; lnum > our_paren_pos.lnum; --lnum) | |
| 7 | 7507 { |
| 829 | 7508 l = skipwhite(ml_get(lnum)); |
| 7509 if (cin_nocode(l)) /* skip comment lines */ | |
| 7510 continue; | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
7511 if (cin_ispreproc_cont(&l, &lnum, &amount)) |
| 829 | 7512 continue; /* ignore #define, #if, etc. */ |
| 7513 curwin->w_cursor.lnum = lnum; | |
| 7514 | |
| 6971 | 7515 /* Skip a comment or raw string. XXX */ |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
7516 if ((trypos = ind_find_start_CORS(NULL)) != NULL) |
| 829 | 7517 { |
| 7518 lnum = trypos->lnum + 1; | |
| 7519 continue; | |
| 7520 } | |
| 7521 | |
| 7522 /* XXX */ | |
| 7523 if ((trypos = find_match_paren( | |
| 5442 | 7524 corr_ind_maxparen(&cur_curpos))) != NULL |
| 829 | 7525 && trypos->lnum == our_paren_pos.lnum |
| 7526 && trypos->col == our_paren_pos.col) | |
| 7527 { | |
| 7528 amount = get_indent_lnum(lnum); /* XXX */ | |
| 7529 | |
| 7530 if (theline[0] == ')') | |
| 7531 { | |
| 7532 if (our_paren_pos.lnum != lnum | |
| 7533 && cur_amount > amount) | |
| 7534 cur_amount = amount; | |
| 7535 amount = -1; | |
| 7536 } | |
| 7537 break; | |
| 7538 } | |
| 7 | 7539 } |
| 7540 } | |
| 7541 | |
| 7542 /* | |
| 7543 * Line up with line where the matching paren is. XXX | |
| 7544 * If the line starts with a '(' or the indent for unclosed | |
| 7545 * parentheses is zero, line up with the unclosed parentheses. | |
| 7546 */ | |
| 7547 if (amount == -1) | |
| 7548 { | |
| 829 | 7549 int ignore_paren_col = 0; |
| 3454 | 7550 int is_if_for_while = 0; |
| 7551 | |
| 5438 | 7552 if (curbuf->b_ind_if_for_while) |
| 3454 | 7553 { |
| 7554 /* Look for the outermost opening parenthesis on this line | |
| 7555 * and check whether it belongs to an "if", "for" or "while". */ | |
| 7556 | |
| 7557 pos_T cursor_save = curwin->w_cursor; | |
| 7558 pos_T outermost; | |
| 7559 char_u *line; | |
| 7560 | |
| 7561 trypos = &our_paren_pos; | |
| 7562 do { | |
| 7563 outermost = *trypos; | |
| 7564 curwin->w_cursor.lnum = outermost.lnum; | |
| 7565 curwin->w_cursor.col = outermost.col; | |
| 7566 | |
| 5442 | 7567 trypos = find_match_paren(curbuf->b_ind_maxparen); |
| 3454 | 7568 } while (trypos && trypos->lnum == outermost.lnum); |
| 7569 | |
| 7570 curwin->w_cursor = cursor_save; | |
| 7571 | |
| 7572 line = ml_get(outermost.lnum); | |
| 7573 | |
| 7574 is_if_for_while = | |
| 3461 | 7575 cin_is_if_for_while_before_offset(line, &outermost.col); |
| 3454 | 7576 } |
| 829 | 7577 |
| 5442 | 7578 amount = skip_label(our_paren_pos.lnum, &look); |
| 829 | 7579 look = skipwhite(look); |
| 7580 if (*look == '(') | |
| 7581 { | |
| 7582 linenr_T save_lnum = curwin->w_cursor.lnum; | |
| 7583 char_u *line; | |
| 7584 int look_col; | |
| 7585 | |
| 7586 /* Ignore a '(' in front of the line that has a match before | |
| 7587 * our matching '('. */ | |
| 7588 curwin->w_cursor.lnum = our_paren_pos.lnum; | |
| 7589 line = ml_get_curline(); | |
| 835 | 7590 look_col = (int)(look - line); |
| 829 | 7591 curwin->w_cursor.col = look_col + 1; |
| 5438 | 7592 if ((trypos = findmatchlimit(NULL, ')', 0, |
| 7593 curbuf->b_ind_maxparen)) | |
| 829 | 7594 != NULL |
| 7595 && trypos->lnum == our_paren_pos.lnum | |
| 7596 && trypos->col < our_paren_pos.col) | |
| 7597 ignore_paren_col = trypos->col + 1; | |
| 7598 | |
| 7599 curwin->w_cursor.lnum = save_lnum; | |
| 7600 look = ml_get(our_paren_pos.lnum) + look_col; | |
| 7601 } | |
| 5438 | 7602 if (theline[0] == ')' || (curbuf->b_ind_unclosed == 0 |
| 7603 && is_if_for_while == 0) | |
| 7604 || (!curbuf->b_ind_unclosed_noignore && *look == '(' | |
| 829 | 7605 && ignore_paren_col == 0)) |
| 7 | 7606 { |
| 7607 /* | |
| 7608 * If we're looking at a close paren, line up right there; | |
| 7609 * otherwise, line up with the next (non-white) character. | |
| 5438 | 7610 * When b_ind_unclosed_wrapped is set and the matching paren is |
| 7 | 7611 * the last nonwhite character of the line, use either the |
| 7612 * indent of the current line or the indentation of the next | |
| 5438 | 7613 * outer paren and add b_ind_unclosed_wrapped (for very long |
| 7 | 7614 * lines). |
| 7615 */ | |
| 7616 if (theline[0] != ')') | |
| 7617 { | |
| 7618 cur_amount = MAXCOL; | |
| 7619 l = ml_get(our_paren_pos.lnum); | |
| 5438 | 7620 if (curbuf->b_ind_unclosed_wrapped |
| 7 | 7621 && cin_ends_in(l, (char_u *)"(", NULL)) |
| 7622 { | |
| 7623 /* look for opening unmatched paren, indent one level | |
| 7624 * for each additional level */ | |
| 7625 n = 1; | |
| 7626 for (col = 0; col < our_paren_pos.col; ++col) | |
| 7627 { | |
| 7628 switch (l[col]) | |
| 7629 { | |
| 7630 case '(': | |
| 7631 case '{': ++n; | |
| 7632 break; | |
| 7633 | |
| 7634 case ')': | |
| 7635 case '}': if (n > 1) | |
| 7636 --n; | |
| 7637 break; | |
| 7638 } | |
| 7639 } | |
| 7640 | |
| 7641 our_paren_pos.col = 0; | |
| 5438 | 7642 amount += n * curbuf->b_ind_unclosed_wrapped; |
| 7 | 7643 } |
| 5438 | 7644 else if (curbuf->b_ind_unclosed_whiteok) |
| 7 | 7645 our_paren_pos.col++; |
| 7646 else | |
| 7647 { | |
| 7648 col = our_paren_pos.col + 1; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
7649 while (VIM_ISWHITE(l[col])) |
| 7 | 7650 col++; |
| 7651 if (l[col] != NUL) /* In case of trailing space */ | |
| 7652 our_paren_pos.col = col; | |
| 7653 else | |
| 7654 our_paren_pos.col++; | |
| 7655 } | |
| 7656 } | |
| 7657 | |
| 7658 /* | |
| 7659 * Find how indented the paren is, or the character after it | |
| 7660 * if we did the above "if". | |
| 7661 */ | |
| 7662 if (our_paren_pos.col > 0) | |
| 7663 { | |
| 7664 getvcol(curwin, &our_paren_pos, &col, NULL, NULL); | |
| 7665 if (cur_amount > (int)col) | |
| 7666 cur_amount = col; | |
| 7667 } | |
| 7668 } | |
| 7669 | |
| 5438 | 7670 if (theline[0] == ')' && curbuf->b_ind_matching_paren) |
| 7 | 7671 { |
| 7672 /* Line up with the start of the matching paren line. */ | |
| 7673 } | |
| 5438 | 7674 else if ((curbuf->b_ind_unclosed == 0 && is_if_for_while == 0) |
| 7675 || (!curbuf->b_ind_unclosed_noignore | |
| 829 | 7676 && *look == '(' && ignore_paren_col == 0)) |
| 7 | 7677 { |
| 7678 if (cur_amount != MAXCOL) | |
| 7679 amount = cur_amount; | |
| 7680 } | |
| 7681 else | |
| 7682 { | |
| 5438 | 7683 /* Add b_ind_unclosed2 for each '(' before our matching one, |
| 7684 * but ignore (void) before the line (ignore_paren_col). */ | |
| 7 | 7685 col = our_paren_pos.col; |
| 834 | 7686 while ((int)our_paren_pos.col > ignore_paren_col) |
| 7 | 7687 { |
| 7688 --our_paren_pos.col; | |
| 7689 switch (*ml_get_pos(&our_paren_pos)) | |
| 7690 { | |
| 5438 | 7691 case '(': amount += curbuf->b_ind_unclosed2; |
| 7 | 7692 col = our_paren_pos.col; |
| 7693 break; | |
| 5438 | 7694 case ')': amount -= curbuf->b_ind_unclosed2; |
| 7 | 7695 col = MAXCOL; |
| 7696 break; | |
| 7697 } | |
| 7698 } | |
| 7699 | |
| 5438 | 7700 /* Use b_ind_unclosed once, when the first '(' is not inside |
| 7 | 7701 * braces */ |
| 7702 if (col == MAXCOL) | |
| 5438 | 7703 amount += curbuf->b_ind_unclosed; |
| 7 | 7704 else |
| 7705 { | |
| 7706 curwin->w_cursor.lnum = our_paren_pos.lnum; | |
| 7707 curwin->w_cursor.col = col; | |
| 6020 | 7708 if (find_match_paren_after_brace(curbuf->b_ind_maxparen) |
| 7709 != NULL) | |
| 5438 | 7710 amount += curbuf->b_ind_unclosed2; |
| 7 | 7711 else |
| 3454 | 7712 { |
| 7713 if (is_if_for_while) | |
| 5438 | 7714 amount += curbuf->b_ind_if_for_while; |
| 3454 | 7715 else |
| 5438 | 7716 amount += curbuf->b_ind_unclosed; |
| 3454 | 7717 } |
| 7 | 7718 } |
| 7719 /* | |
| 7720 * For a line starting with ')' use the minimum of the two | |
| 7721 * positions, to avoid giving it more indent than the previous | |
| 7722 * lines: | |
| 7723 * func_long_name( if (x | |
| 7724 * arg && yy | |
| 7725 * ) ^ not here ) ^ not here | |
| 7726 */ | |
| 7727 if (cur_amount < amount) | |
| 7728 amount = cur_amount; | |
| 7729 } | |
| 7730 } | |
| 7731 | |
| 7732 /* add extra indent for a comment */ | |
| 7733 if (cin_iscomment(theline)) | |
| 5438 | 7734 amount += curbuf->b_ind_comment; |
| 7 | 7735 } |
| 7736 else | |
| 7737 { | |
| 6030 | 7738 /* |
| 7739 * We are inside braces, there is a { before this line at the position | |
| 7740 * stored in tryposBrace. | |
| 6114 | 7741 * Make a copy of tryposBrace, it may point to pos_copy inside |
| 7742 * find_start_brace(), which may be changed somewhere. | |
| 6030 | 7743 */ |
| 6971 | 7744 tryposCopy = *tryposBrace; |
| 7745 tryposBrace = &tryposCopy; | |
| 7 | 7746 trypos = tryposBrace; |
| 7747 ourscope = trypos->lnum; | |
| 7748 start = ml_get(ourscope); | |
| 7749 | |
| 7750 /* | |
| 7751 * Now figure out how indented the line is in general. | |
| 7752 * If the brace was at the start of the line, we use that; | |
| 7753 * otherwise, check out the indentation of the line as | |
| 7754 * a whole and then add the "imaginary indent" to that. | |
| 7755 */ | |
| 7756 look = skipwhite(start); | |
| 7757 if (*look == '{') | |
| 7758 { | |
| 7759 getvcol(curwin, trypos, &col, NULL, NULL); | |
| 7760 amount = col; | |
| 7761 if (*start == '{') | |
| 7762 start_brace = BRACE_IN_COL0; | |
| 7763 else | |
| 7764 start_brace = BRACE_AT_START; | |
| 7765 } | |
| 7766 else | |
| 7767 { | |
| 6030 | 7768 /* That opening brace might have been on a continuation |
| 7769 * line. if so, find the start of the line. */ | |
| 7 | 7770 curwin->w_cursor.lnum = ourscope; |
| 7771 | |
| 6030 | 7772 /* Position the cursor over the rightmost paren, so that |
| 7773 * matching it will take us back to the start of the line. */ | |
| 7 | 7774 lnum = ourscope; |
| 7775 if (find_last_paren(start, '(', ')') | |
| 5442 | 7776 && (trypos = find_match_paren(curbuf->b_ind_maxparen)) |
| 7777 != NULL) | |
| 7 | 7778 lnum = trypos->lnum; |
| 7779 | |
| 6030 | 7780 /* It could have been something like |
| 7 | 7781 * case 1: if (asdf && |
| 7782 * ldfd) { | |
| 7783 * } | |
| 7784 */ | |
| 6016 | 7785 if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label) |
| 7786 && cin_iscase(skipwhite(ml_get_curline()), FALSE)) | |
| 7 | 7787 amount = get_indent(); |
| 6016 | 7788 else if (curbuf->b_ind_js) |
| 7789 amount = get_indent_lnum(lnum); | |
| 7 | 7790 else |
| 5442 | 7791 amount = skip_label(lnum, &l); |
| 7 | 7792 |
| 7793 start_brace = BRACE_AT_END; | |
| 7794 } | |
| 7795 | |
| 6030 | 7796 /* For Javascript check if the line starts with "key:". */ |
| 7797 if (curbuf->b_ind_js) | |
| 7798 js_cur_has_key = cin_has_js_key(theline); | |
| 7799 | |
| 7 | 7800 /* |
| 6030 | 7801 * If we're looking at a closing brace, that's where |
| 7 | 7802 * we want to be. otherwise, add the amount of room |
| 7803 * that an indent is supposed to be. | |
| 7804 */ | |
| 7805 if (theline[0] == '}') | |
| 7806 { | |
| 7807 /* | |
| 7808 * they may want closing braces to line up with something | |
| 7809 * other than the open brace. indulge them, if so. | |
| 7810 */ | |
| 5438 | 7811 amount += curbuf->b_ind_close_extra; |
| 7 | 7812 } |
| 7813 else | |
| 7814 { | |
| 7815 /* | |
| 7816 * If we're looking at an "else", try to find an "if" | |
| 7817 * to match it with. | |
| 7818 * If we're looking at a "while", try to find a "do" | |
| 7819 * to match it with. | |
| 7820 */ | |
| 7821 lookfor = LOOKFOR_INITIAL; | |
| 7822 if (cin_iselse(theline)) | |
| 7823 lookfor = LOOKFOR_IF; | |
| 5442 | 7824 else if (cin_iswhileofdo(theline, cur_curpos.lnum)) /* XXX */ |
| 7 | 7825 lookfor = LOOKFOR_DO; |
| 7826 if (lookfor != LOOKFOR_INITIAL) | |
| 7827 { | |
| 7828 curwin->w_cursor.lnum = cur_curpos.lnum; | |
| 5442 | 7829 if (find_match(lookfor, ourscope) == OK) |
| 7 | 7830 { |
| 7831 amount = get_indent(); /* XXX */ | |
| 7832 goto theend; | |
| 7833 } | |
| 7834 } | |
| 7835 | |
| 7836 /* | |
| 7837 * We get here if we are not on an "while-of-do" or "else" (or | |
| 7838 * failed to find a matching "if"). | |
| 7839 * Search backwards for something to line up with. | |
| 7840 * First set amount for when we don't find anything. | |
| 7841 */ | |
| 7842 | |
| 7843 /* | |
| 7844 * if the '{' is _really_ at the left margin, use the imaginary | |
| 7845 * location of a left-margin brace. Otherwise, correct the | |
| 5438 | 7846 * location for b_ind_open_extra. |
| 7 | 7847 */ |
| 7848 | |
| 7849 if (start_brace == BRACE_IN_COL0) /* '{' is in column 0 */ | |
| 7850 { | |
| 5438 | 7851 amount = curbuf->b_ind_open_left_imag; |
| 2857 | 7852 lookfor_cpp_namespace = TRUE; |
| 7853 } | |
| 7854 else if (start_brace == BRACE_AT_START && | |
| 7855 lookfor_cpp_namespace) /* '{' is at start */ | |
| 7856 { | |
| 7857 | |
| 7858 lookfor_cpp_namespace = TRUE; | |
| 7 | 7859 } |
| 7860 else | |
| 7861 { | |
| 7862 if (start_brace == BRACE_AT_END) /* '{' is at end of line */ | |
| 2857 | 7863 { |
| 5438 | 7864 amount += curbuf->b_ind_open_imag; |
| 2857 | 7865 |
| 7866 l = skipwhite(ml_get_curline()); | |
| 7867 if (cin_is_cpp_namespace(l)) | |
| 5438 | 7868 amount += curbuf->b_ind_cpp_namespace; |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
7869 else if (cin_is_cpp_extern_c(l)) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
7870 amount += curbuf->b_ind_cpp_extern_c; |
| 2857 | 7871 } |
| 7 | 7872 else |
| 7873 { | |
| 5438 | 7874 /* Compensate for adding b_ind_open_extra later. */ |
| 7875 amount -= curbuf->b_ind_open_extra; | |
| 7 | 7876 if (amount < 0) |
| 7877 amount = 0; | |
| 7878 } | |
| 7879 } | |
| 7880 | |
| 7881 lookfor_break = FALSE; | |
| 7882 | |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
7883 if (cin_iscase(theline, FALSE)) /* it's a switch() label */ |
| 7 | 7884 { |
| 7885 lookfor = LOOKFOR_CASE; /* find a previous switch() label */ | |
| 5438 | 7886 amount += curbuf->b_ind_case; |
| 7 | 7887 } |
| 7888 else if (cin_isscopedecl(theline)) /* private:, ... */ | |
| 7889 { | |
| 7890 lookfor = LOOKFOR_SCOPEDECL; /* class decl is this block */ | |
| 5438 | 7891 amount += curbuf->b_ind_scopedecl; |
| 7 | 7892 } |
| 7893 else | |
| 7894 { | |
| 5438 | 7895 if (curbuf->b_ind_case_break && cin_isbreak(theline)) |
| 7896 /* break; ... */ | |
| 7 | 7897 lookfor_break = TRUE; |
| 7898 | |
| 7899 lookfor = LOOKFOR_INITIAL; | |
| 5438 | 7900 /* b_ind_level from start of block */ |
| 7901 amount += curbuf->b_ind_level; | |
| 7 | 7902 } |
| 7903 scope_amount = amount; | |
| 7904 whilelevel = 0; | |
| 7905 | |
| 7906 /* | |
| 7907 * Search backwards. If we find something we recognize, line up | |
| 7908 * with that. | |
| 7909 * | |
| 6030 | 7910 * If we're looking at an open brace, indent |
| 7 | 7911 * the usual amount relative to the conditional |
| 7912 * that opens the block. | |
| 7913 */ | |
| 7914 curwin->w_cursor = cur_curpos; | |
| 7915 for (;;) | |
| 7916 { | |
| 7917 curwin->w_cursor.lnum--; | |
| 7918 curwin->w_cursor.col = 0; | |
| 7919 | |
| 7920 /* | |
| 7921 * If we went all the way back to the start of our scope, line | |
| 7922 * up with it. | |
| 7923 */ | |
| 7924 if (curwin->w_cursor.lnum <= ourscope) | |
| 7925 { | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
7926 /* We reached end of scope: |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
7927 * If looking for a enum or structure initialization |
| 7 | 7928 * go further back: |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
7929 * If it is an initializer (enum xxx or xxx =), then |
| 7 | 7930 * don't add ind_continuation, otherwise it is a variable |
| 7931 * declaration: | |
| 7932 * int x, | |
| 7933 * here; <-- add ind_continuation | |
| 7934 */ | |
| 7935 if (lookfor == LOOKFOR_ENUM_OR_INIT) | |
| 7936 { | |
| 7937 if (curwin->w_cursor.lnum == 0 | |
| 7938 || curwin->w_cursor.lnum | |
| 5438 | 7939 < ourscope - curbuf->b_ind_maxparen) |
| 7 | 7940 { |
| 5438 | 7941 /* nothing found (abuse curbuf->b_ind_maxparen as |
| 7942 * limit) assume terminated line (i.e. a variable | |
| 7 | 7943 * initialization) */ |
| 7944 if (cont_amount > 0) | |
| 7945 amount = cont_amount; | |
| 5438 | 7946 else if (!curbuf->b_ind_js) |
| 7 | 7947 amount += ind_continuation; |
| 7948 break; | |
| 7949 } | |
| 7950 | |
| 7951 l = ml_get_curline(); | |
| 7952 | |
| 7953 /* | |
| 6971 | 7954 * If we're in a comment or raw string now, skip to |
| 7955 * the start of it. | |
| 7 | 7956 */ |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
7957 trypos = ind_find_start_CORS(NULL); |
| 7 | 7958 if (trypos != NULL) |
| 7959 { | |
| 7960 curwin->w_cursor.lnum = trypos->lnum + 1; | |
| 1550 | 7961 curwin->w_cursor.col = 0; |
| 7 | 7962 continue; |
| 7963 } | |
| 7964 | |
| 7965 /* | |
| 7966 * Skip preprocessor directives and blank lines. | |
| 7967 */ | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
7968 if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
7969 &amount)) |
| 7 | 7970 continue; |
| 7971 | |
| 7972 if (cin_nocode(l)) | |
| 7973 continue; | |
| 7974 | |
| 7975 terminated = cin_isterminated(l, FALSE, TRUE); | |
| 7976 | |
| 7977 /* | |
| 7978 * If we are at top level and the line looks like a | |
| 7979 * function declaration, we are done | |
| 7980 * (it's a variable declaration). | |
| 7981 */ | |
| 7982 if (start_brace != BRACE_IN_COL0 | |
| 5442 | 7983 || !cin_isfuncdecl(&l, curwin->w_cursor.lnum, 0)) |
| 7 | 7984 { |
| 7985 /* if the line is terminated with another ',' | |
| 7986 * it is a continued variable initialization. | |
| 7987 * don't add extra indent. | |
| 7988 * TODO: does not work, if a function | |
| 7989 * declaration is split over multiple lines: | |
| 7990 * cin_isfuncdecl returns FALSE then. | |
| 7991 */ | |
| 7992 if (terminated == ',') | |
| 7993 break; | |
| 7994 | |
| 7995 /* if it es a enum declaration or an assignment, | |
| 7996 * we are done. | |
| 7997 */ | |
| 7998 if (terminated != ';' && cin_isinit()) | |
| 7999 break; | |
| 8000 | |
| 8001 /* nothing useful found */ | |
| 8002 if (terminated == 0 || terminated == '{') | |
| 8003 continue; | |
| 8004 } | |
| 8005 | |
| 8006 if (terminated != ';') | |
| 8007 { | |
| 8008 /* Skip parens and braces. Position the cursor | |
| 8009 * over the rightmost paren, so that matching it | |
| 8010 * will take us back to the start of the line. | |
| 8011 */ /* XXX */ | |
| 8012 trypos = NULL; | |
| 8013 if (find_last_paren(l, '(', ')')) | |
| 5438 | 8014 trypos = find_match_paren( |
| 5442 | 8015 curbuf->b_ind_maxparen); |
| 7 | 8016 |
| 8017 if (trypos == NULL && find_last_paren(l, '{', '}')) | |
| 5442 | 8018 trypos = find_start_brace(); |
| 7 | 8019 |
| 8020 if (trypos != NULL) | |
| 8021 { | |
| 8022 curwin->w_cursor.lnum = trypos->lnum + 1; | |
| 1550 | 8023 curwin->w_cursor.col = 0; |
| 7 | 8024 continue; |
| 8025 } | |
| 8026 } | |
| 8027 | |
| 8028 /* it's a variable declaration, add indentation | |
| 8029 * like in | |
| 8030 * int a, | |
| 8031 * b; | |
| 8032 */ | |
| 8033 if (cont_amount > 0) | |
| 8034 amount = cont_amount; | |
| 8035 else | |
| 8036 amount += ind_continuation; | |
| 8037 } | |
| 8038 else if (lookfor == LOOKFOR_UNTERM) | |
| 8039 { | |
| 8040 if (cont_amount > 0) | |
| 8041 amount = cont_amount; | |
| 8042 else | |
| 8043 amount += ind_continuation; | |
| 8044 } | |
| 3123 | 8045 else |
| 2857 | 8046 { |
| 3123 | 8047 if (lookfor != LOOKFOR_TERM |
| 6691 | 8048 && lookfor != LOOKFOR_CPP_BASECLASS |
| 8049 && lookfor != LOOKFOR_COMMA) | |
| 2857 | 8050 { |
| 3123 | 8051 amount = scope_amount; |
| 8052 if (theline[0] == '{') | |
| 8053 { | |
| 5438 | 8054 amount += curbuf->b_ind_open_extra; |
| 8055 added_to_amount = curbuf->b_ind_open_extra; | |
| 3123 | 8056 } |
| 2857 | 8057 } |
| 8058 | |
| 3123 | 8059 if (lookfor_cpp_namespace) |
| 2857 | 8060 { |
| 3123 | 8061 /* |
| 8062 * Looking for C++ namespace, need to look further | |
| 8063 * back. | |
| 8064 */ | |
| 8065 if (curwin->w_cursor.lnum == ourscope) | |
| 8066 continue; | |
| 8067 | |
| 8068 if (curwin->w_cursor.lnum == 0 | |
| 8069 || curwin->w_cursor.lnum | |
| 8070 < ourscope - FIND_NAMESPACE_LIM) | |
| 8071 break; | |
| 8072 | |
| 8073 l = ml_get_curline(); | |
| 8074 | |
| 6971 | 8075 /* If we're in a comment or raw string now, skip |
| 8076 * to the start of it. */ | |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
8077 trypos = ind_find_start_CORS(NULL); |
| 3123 | 8078 if (trypos != NULL) |
| 8079 { | |
| 8080 curwin->w_cursor.lnum = trypos->lnum + 1; | |
| 8081 curwin->w_cursor.col = 0; | |
| 8082 continue; | |
| 8083 } | |
| 8084 | |
| 8085 /* Skip preprocessor directives and blank lines. */ | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
8086 if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, |
|
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
8087 &amount)) |
| 3123 | 8088 continue; |
| 8089 | |
| 8090 /* Finally the actual check for "namespace". */ | |
| 8091 if (cin_is_cpp_namespace(l)) | |
| 8092 { | |
| 5438 | 8093 amount += curbuf->b_ind_cpp_namespace |
| 8094 - added_to_amount; | |
| 3123 | 8095 break; |
| 8096 } | |
|
11087
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
8097 else if (cin_is_cpp_extern_c(l)) |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
8098 { |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
8099 amount += curbuf->b_ind_cpp_extern_c |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
8100 - added_to_amount; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
8101 break; |
|
242e0617aa51
patch 8.0.0431: 'cinoptions' cannot set indent for extern block
Christian Brabandt <cb@256bit.org>
parents:
11069
diff
changeset
|
8102 } |
| 3123 | 8103 |
| 8104 if (cin_nocode(l)) | |
| 8105 continue; | |
| 2857 | 8106 } |
| 7 | 8107 } |
| 8108 break; | |
| 8109 } | |
| 8110 | |
| 8111 /* | |
| 6971 | 8112 * If we're in a comment or raw string now, skip to the start |
| 8113 * of it. | |
| 7 | 8114 */ /* XXX */ |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
8115 if ((trypos = ind_find_start_CORS(&raw_string_start)) != NULL) |
| 7 | 8116 { |
| 8117 curwin->w_cursor.lnum = trypos->lnum + 1; | |
| 1550 | 8118 curwin->w_cursor.col = 0; |
| 7 | 8119 continue; |
| 8120 } | |
| 8121 | |
| 8122 l = ml_get_curline(); | |
| 8123 | |
| 8124 /* | |
| 8125 * If this is a switch() label, may line up relative to that. | |
| 827 | 8126 * If this is a C++ scope declaration, do the same. |
| 7 | 8127 */ |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
8128 iscase = cin_iscase(l, FALSE); |
| 7 | 8129 if (iscase || cin_isscopedecl(l)) |
| 8130 { | |
| 8131 /* we are only looking for cpp base class | |
| 8132 * declaration/initialization any longer */ | |
| 8133 if (lookfor == LOOKFOR_CPP_BASECLASS) | |
| 8134 break; | |
| 8135 | |
| 8136 /* When looking for a "do" we are not interested in | |
| 8137 * labels. */ | |
| 8138 if (whilelevel > 0) | |
| 8139 continue; | |
| 8140 | |
| 8141 /* | |
| 8142 * case xx: | |
| 8143 * c = 99 + <- this indent plus continuation | |
| 8144 *-> here; | |
| 8145 */ | |
| 8146 if (lookfor == LOOKFOR_UNTERM | |
| 8147 || lookfor == LOOKFOR_ENUM_OR_INIT) | |
| 8148 { | |
| 8149 if (cont_amount > 0) | |
| 8150 amount = cont_amount; | |
| 8151 else | |
| 8152 amount += ind_continuation; | |
| 8153 break; | |
| 8154 } | |
| 8155 | |
| 8156 /* | |
| 8157 * case xx: <- line up with this case | |
| 8158 * x = 333; | |
| 8159 * case yy: | |
| 8160 */ | |
| 8161 if ( (iscase && lookfor == LOOKFOR_CASE) | |
| 8162 || (iscase && lookfor_break) | |
| 8163 || (!iscase && lookfor == LOOKFOR_SCOPEDECL)) | |
| 8164 { | |
| 8165 /* | |
| 8166 * Check that this case label is not for another | |
| 8167 * switch() | |
| 8168 */ /* XXX */ | |
| 5442 | 8169 if ((trypos = find_start_brace()) == NULL |
| 5438 | 8170 || trypos->lnum == ourscope) |
| 7 | 8171 { |
| 8172 amount = get_indent(); /* XXX */ | |
| 8173 break; | |
| 8174 } | |
| 8175 continue; | |
| 8176 } | |
| 8177 | |
| 8178 n = get_indent_nolabel(curwin->w_cursor.lnum); /* XXX */ | |
| 8179 | |
| 8180 /* | |
| 8181 * case xx: if (cond) <- line up with this if | |
| 8182 * y = y + 1; | |
| 8183 * -> s = 99; | |
| 8184 * | |
| 8185 * case xx: | |
| 8186 * if (cond) <- line up with this line | |
| 8187 * y = y + 1; | |
| 8188 * -> s = 99; | |
| 8189 */ | |
| 8190 if (lookfor == LOOKFOR_TERM) | |
| 8191 { | |
| 8192 if (n) | |
| 8193 amount = n; | |
| 8194 | |
| 8195 if (!lookfor_break) | |
| 8196 break; | |
| 8197 } | |
| 8198 | |
| 8199 /* | |
| 8200 * case xx: x = x + 1; <- line up with this x | |
| 8201 * -> y = y + 1; | |
| 8202 * | |
| 8203 * case xx: if (cond) <- line up with this if | |
| 8204 * -> y = y + 1; | |
| 8205 */ | |
| 8206 if (n) | |
| 8207 { | |
| 8208 amount = n; | |
| 8209 l = after_label(ml_get_curline()); | |
| 8210 if (l != NULL && cin_is_cinword(l)) | |
| 829 | 8211 { |
| 8212 if (theline[0] == '{') | |
| 5438 | 8213 amount += curbuf->b_ind_open_extra; |
| 829 | 8214 else |
| 5438 | 8215 amount += curbuf->b_ind_level |
| 8216 + curbuf->b_ind_no_brace; | |
| 829 | 8217 } |
| 7 | 8218 break; |
| 8219 } | |
| 8220 | |
| 8221 /* | |
| 8222 * Try to get the indent of a statement before the switch | |
| 8223 * label. If nothing is found, line up relative to the | |
| 8224 * switch label. | |
| 8225 * break; <- may line up with this line | |
| 8226 * case xx: | |
| 8227 * -> y = 1; | |
| 8228 */ | |
| 8229 scope_amount = get_indent() + (iscase /* XXX */ | |
| 5438 | 8230 ? curbuf->b_ind_case_code |
| 8231 : curbuf->b_ind_scopedecl_code); | |
| 8232 lookfor = curbuf->b_ind_case_break | |
| 8233 ? LOOKFOR_NOBREAK : LOOKFOR_ANY; | |
| 7 | 8234 continue; |
| 8235 } | |
| 8236 | |
| 8237 /* | |
| 8238 * Looking for a switch() label or C++ scope declaration, | |
| 8239 * ignore other lines, skip {}-blocks. | |
| 8240 */ | |
| 8241 if (lookfor == LOOKFOR_CASE || lookfor == LOOKFOR_SCOPEDECL) | |
| 8242 { | |
| 5442 | 8243 if (find_last_paren(l, '{', '}') |
| 8244 && (trypos = find_start_brace()) != NULL) | |
| 1550 | 8245 { |
| 7 | 8246 curwin->w_cursor.lnum = trypos->lnum + 1; |
| 1550 | 8247 curwin->w_cursor.col = 0; |
| 8248 } | |
| 7 | 8249 continue; |
| 8250 } | |
| 8251 | |
| 8252 /* | |
| 8253 * Ignore jump labels with nothing after them. | |
| 8254 */ | |
| 5442 | 8255 if (!curbuf->b_ind_js && cin_islabel()) |
| 7 | 8256 { |
| 8257 l = after_label(ml_get_curline()); | |
| 8258 if (l == NULL || cin_nocode(l)) | |
| 8259 continue; | |
| 8260 } | |
| 8261 | |
| 8262 /* | |
| 8263 * Ignore #defines, #if, etc. | |
| 8264 * Ignore comment and empty lines. | |
| 8265 * (need to get the line again, cin_islabel() may have | |
| 8266 * unlocked it) | |
| 8267 */ | |
| 8268 l = ml_get_curline(); | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
8269 if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, &amount) |
| 7 | 8270 || cin_nocode(l)) |
| 8271 continue; | |
| 8272 | |
| 8273 /* | |
| 8274 * Are we at the start of a cpp base class declaration or | |
| 8275 * constructor initialization? | |
| 8276 */ /* XXX */ | |
| 827 | 8277 n = FALSE; |
| 5438 | 8278 if (lookfor != LOOKFOR_TERM && curbuf->b_ind_cpp_baseclass > 0) |
| 827 | 8279 { |
| 6803 | 8280 n = cin_is_cpp_baseclass(&cache_cpp_baseclass); |
| 827 | 8281 l = ml_get_curline(); |
| 8282 } | |
| 8283 if (n) | |
| 7 | 8284 { |
| 8285 if (lookfor == LOOKFOR_UNTERM) | |
| 8286 { | |
| 8287 if (cont_amount > 0) | |
| 8288 amount = cont_amount; | |
| 8289 else | |
| 8290 amount += ind_continuation; | |
| 8291 } | |
| 828 | 8292 else if (theline[0] == '{') |
| 7 | 8293 { |
| 828 | 8294 /* Need to find start of the declaration. */ |
| 8295 lookfor = LOOKFOR_UNTERM; | |
| 8296 ind_continuation = 0; | |
| 8297 continue; | |
| 7 | 8298 } |
| 8299 else | |
| 828 | 8300 /* XXX */ |
| 6803 | 8301 amount = get_baseclass_amount( |
| 8302 cache_cpp_baseclass.lpos.col); | |
| 7 | 8303 break; |
| 8304 } | |
| 8305 else if (lookfor == LOOKFOR_CPP_BASECLASS) | |
| 8306 { | |
| 8307 /* only look, whether there is a cpp base class | |
| 827 | 8308 * declaration or initialization before the opening brace. |
| 8309 */ | |
| 7 | 8310 if (cin_isterminated(l, TRUE, FALSE)) |
| 8311 break; | |
| 8312 else | |
| 8313 continue; | |
| 8314 } | |
| 8315 | |
| 8316 /* | |
| 8317 * What happens next depends on the line being terminated. | |
| 8318 * If terminated with a ',' only consider it terminating if | |
| 1224 | 8319 * there is another unterminated statement behind, eg: |
| 7 | 8320 * 123, |
| 8321 * sizeof | |
| 8322 * here | |
| 8323 * Otherwise check whether it is a enumeration or structure | |
| 8324 * initialisation (not indented) or a variable declaration | |
| 8325 * (indented). | |
| 8326 */ | |
| 8327 terminated = cin_isterminated(l, FALSE, TRUE); | |
| 8328 | |
| 6030 | 8329 if (js_cur_has_key) |
| 8330 { | |
| 8331 js_cur_has_key = 0; /* only check the first line */ | |
| 8332 if (curbuf->b_ind_js && terminated == ',') | |
| 8333 { | |
| 8334 /* For Javascript we might be inside an object: | |
| 8335 * key: something, <- align with this | |
| 8336 * key: something | |
| 8337 * or: | |
| 8338 * key: something + <- align with this | |
| 8339 * something, | |
| 8340 * key: something | |
| 8341 */ | |
| 8342 lookfor = LOOKFOR_JS_KEY; | |
| 8343 } | |
| 8344 } | |
| 8345 if (lookfor == LOOKFOR_JS_KEY && cin_has_js_key(l)) | |
| 8346 { | |
| 8347 amount = get_indent(); | |
| 8348 break; | |
| 8349 } | |
| 6691 | 8350 if (lookfor == LOOKFOR_COMMA) |
| 6030 | 8351 { |
| 6691 | 8352 if (tryposBrace != NULL && tryposBrace->lnum |
| 8353 >= curwin->w_cursor.lnum) | |
| 8354 break; | |
| 8355 if (terminated == ',') | |
| 6030 | 8356 /* line below current line is the one that starts a |
| 8357 * (possibly broken) line ending in a comma. */ | |
| 8358 break; | |
| 6691 | 8359 else |
| 8360 { | |
| 8361 amount = get_indent(); | |
| 8362 if (curwin->w_cursor.lnum - 1 == ourscope) | |
| 8363 /* line above is start of the scope, thus current | |
| 8364 * line is the one that stars a (possibly broken) | |
| 8365 * line ending in a comma. */ | |
| 8366 break; | |
| 8367 } | |
| 6030 | 8368 } |
| 8369 | |
| 7 | 8370 if (terminated == 0 || (lookfor != LOOKFOR_UNTERM |
| 8371 && terminated == ',')) | |
| 8372 { | |
|
7160
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
8373 if (lookfor != LOOKFOR_ENUM_OR_INIT && |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
8374 (*skipwhite(l) == '[' || l[STRLEN(l) - 1] == '[')) |
| 6691 | 8375 amount += ind_continuation; |
| 7 | 8376 /* |
| 8377 * if we're in the middle of a paren thing, | |
| 8378 * go back to the line that starts it so | |
| 8379 * we can get the right prevailing indent | |
| 8380 * if ( foo && | |
| 8381 * bar ) | |
| 8382 */ | |
| 8383 /* | |
| 6030 | 8384 * Position the cursor over the rightmost paren, so that |
| 7 | 8385 * matching it will take us back to the start of the line. |
| 6030 | 8386 * Ignore a match before the start of the block. |
| 7 | 8387 */ |
| 8388 (void)find_last_paren(l, '(', ')'); | |
| 5442 | 8389 trypos = find_match_paren(corr_ind_maxparen(&cur_curpos)); |
| 6030 | 8390 if (trypos != NULL && (trypos->lnum < tryposBrace->lnum |
| 8391 || (trypos->lnum == tryposBrace->lnum | |
| 8392 && trypos->col < tryposBrace->col))) | |
| 8393 trypos = NULL; | |
| 7 | 8394 |
| 8395 /* | |
| 8396 * If we are looking for ',', we also look for matching | |
| 8397 * braces. | |
| 8398 */ | |
| 828 | 8399 if (trypos == NULL && terminated == ',' |
| 8400 && find_last_paren(l, '{', '}')) | |
| 5442 | 8401 trypos = find_start_brace(); |
| 7 | 8402 |
| 8403 if (trypos != NULL) | |
| 8404 { | |
| 8405 /* | |
| 8406 * Check if we are on a case label now. This is | |
| 8407 * handled above. | |
| 8408 * case xx: if ( asdf && | |
| 8409 * asdf) | |
| 8410 */ | |
| 1550 | 8411 curwin->w_cursor = *trypos; |
| 7 | 8412 l = ml_get_curline(); |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
8413 if (cin_iscase(l, FALSE) || cin_isscopedecl(l)) |
| 7 | 8414 { |
| 8415 ++curwin->w_cursor.lnum; | |
| 1550 | 8416 curwin->w_cursor.col = 0; |
| 7 | 8417 continue; |
| 8418 } | |
| 8419 } | |
| 8420 | |
| 8421 /* | |
| 8422 * Skip over continuation lines to find the one to get the | |
| 8423 * indent from | |
| 8424 * char *usethis = "bla\ | |
| 8425 * bla", | |
| 8426 * here; | |
| 8427 */ | |
| 8428 if (terminated == ',') | |
| 8429 { | |
| 8430 while (curwin->w_cursor.lnum > 1) | |
| 8431 { | |
| 8432 l = ml_get(curwin->w_cursor.lnum - 1); | |
| 8433 if (*l == NUL || l[STRLEN(l) - 1] != '\\') | |
| 8434 break; | |
| 8435 --curwin->w_cursor.lnum; | |
| 1550 | 8436 curwin->w_cursor.col = 0; |
| 7 | 8437 } |
| 8438 } | |
| 8439 | |
| 8440 /* | |
| 8441 * Get indent and pointer to text for current line, | |
| 8442 * ignoring any jump label. XXX | |
| 8443 */ | |
| 6030 | 8444 if (curbuf->b_ind_js) |
| 8445 cur_amount = get_indent(); | |
| 8446 else | |
| 5442 | 8447 cur_amount = skip_label(curwin->w_cursor.lnum, &l); |
| 7 | 8448 /* |
| 8449 * If this is just above the line we are indenting, and it | |
| 8450 * starts with a '{', line it up with this line. | |
| 8451 * while (not) | |
| 8452 * -> { | |
| 8453 * } | |
| 8454 */ | |
| 8455 if (terminated != ',' && lookfor != LOOKFOR_TERM | |
| 8456 && theline[0] == '{') | |
| 8457 { | |
| 8458 amount = cur_amount; | |
| 8459 /* | |
| 5438 | 8460 * Only add b_ind_open_extra when the current line |
| 7 | 8461 * doesn't start with a '{', which must have a match |
| 8462 * in the same line (scope is the same). Probably: | |
| 8463 * { 1, 2 }, | |
| 8464 * -> { 3, 4 } | |
| 8465 */ | |
| 8466 if (*skipwhite(l) != '{') | |
| 5438 | 8467 amount += curbuf->b_ind_open_extra; |
| 8468 | |
| 6030 | 8469 if (curbuf->b_ind_cpp_baseclass && !curbuf->b_ind_js) |
| 7 | 8470 { |
| 8471 /* have to look back, whether it is a cpp base | |
| 8472 * class declaration or initialization */ | |
| 8473 lookfor = LOOKFOR_CPP_BASECLASS; | |
| 8474 continue; | |
| 8475 } | |
| 8476 break; | |
| 8477 } | |
| 8478 | |
| 8479 /* | |
| 8480 * Check if we are after an "if", "while", etc. | |
| 8481 * Also allow " } else". | |
| 8482 */ | |
| 8483 if (cin_is_cinword(l) || cin_iselse(skipwhite(l))) | |
| 8484 { | |
| 8485 /* | |
| 8486 * Found an unterminated line after an if (), line up | |
| 8487 * with the last one. | |
| 8488 * if (cond) | |
| 8489 * 100 + | |
| 8490 * -> here; | |
| 8491 */ | |
| 8492 if (lookfor == LOOKFOR_UNTERM | |
| 8493 || lookfor == LOOKFOR_ENUM_OR_INIT) | |
| 8494 { | |
| 8495 if (cont_amount > 0) | |
| 8496 amount = cont_amount; | |
| 8497 else | |
| 8498 amount += ind_continuation; | |
| 8499 break; | |
| 8500 } | |
| 8501 | |
| 8502 /* | |
| 8503 * If this is just above the line we are indenting, we | |
| 8504 * are finished. | |
| 8505 * while (not) | |
| 8506 * -> here; | |
| 8507 * Otherwise this indent can be used when the line | |
| 8508 * before this is terminated. | |
| 8509 * yyy; | |
| 8510 * if (stat) | |
| 8511 * while (not) | |
| 8512 * xxx; | |
| 8513 * -> here; | |
| 8514 */ | |
| 8515 amount = cur_amount; | |
| 8516 if (theline[0] == '{') | |
| 5438 | 8517 amount += curbuf->b_ind_open_extra; |
| 7 | 8518 if (lookfor != LOOKFOR_TERM) |
| 8519 { | |
| 5438 | 8520 amount += curbuf->b_ind_level |
| 8521 + curbuf->b_ind_no_brace; | |
| 7 | 8522 break; |
| 8523 } | |
| 8524 | |
| 8525 /* | |
| 8526 * Special trick: when expecting the while () after a | |
| 8527 * do, line up with the while() | |
| 8528 * do | |
| 8529 * x = 1; | |
| 8530 * -> here | |
| 8531 */ | |
| 8532 l = skipwhite(ml_get_curline()); | |
| 8533 if (cin_isdo(l)) | |
| 8534 { | |
| 8535 if (whilelevel == 0) | |
| 8536 break; | |
| 8537 --whilelevel; | |
| 8538 } | |
| 8539 | |
| 8540 /* | |
| 8541 * When searching for a terminated line, don't use the | |
| 2855 | 8542 * one between the "if" and the matching "else". |
| 7 | 8543 * Need to use the scope of this "else". XXX |
| 8544 * If whilelevel != 0 continue looking for a "do {". | |
| 8545 */ | |
| 2855 | 8546 if (cin_iselse(l) && whilelevel == 0) |
| 8547 { | |
| 8548 /* If we're looking at "} else", let's make sure we | |
| 8549 * find the opening brace of the enclosing scope, | |
| 8550 * not the one from "if () {". */ | |
| 8551 if (*l == '}') | |
| 8552 curwin->w_cursor.col = | |
| 2861 | 8553 (colnr_T)(l - ml_get_curline()) + 1; |
| 2855 | 8554 |
| 5442 | 8555 if ((trypos = find_start_brace()) == NULL |
| 8556 || find_match(LOOKFOR_IF, trypos->lnum) | |
| 8557 == FAIL) | |
| 2855 | 8558 break; |
| 8559 } | |
| 7 | 8560 } |
| 8561 | |
| 8562 /* | |
| 8563 * If we're below an unterminated line that is not an | |
| 8564 * "if" or something, we may line up with this line or | |
| 1224 | 8565 * add something for a continuation line, depending on |
| 7 | 8566 * the line before this one. |
| 8567 */ | |
| 8568 else | |
| 8569 { | |
| 8570 /* | |
| 8571 * Found two unterminated lines on a row, line up with | |
| 8572 * the last one. | |
| 8573 * c = 99 + | |
| 8574 * 100 + | |
| 8575 * -> here; | |
| 8576 */ | |
| 8577 if (lookfor == LOOKFOR_UNTERM) | |
| 8578 { | |
| 8579 /* When line ends in a comma add extra indent */ | |
| 8580 if (terminated == ',') | |
| 8581 amount += ind_continuation; | |
| 8582 break; | |
| 8583 } | |
| 8584 | |
| 8585 if (lookfor == LOOKFOR_ENUM_OR_INIT) | |
| 8586 { | |
| 8587 /* Found two lines ending in ',', lineup with the | |
| 8588 * lowest one, but check for cpp base class | |
| 8589 * declaration/initialization, if it is an | |
| 8590 * opening brace or we are looking just for | |
| 8591 * enumerations/initializations. */ | |
| 8592 if (terminated == ',') | |
| 8593 { | |
| 5438 | 8594 if (curbuf->b_ind_cpp_baseclass == 0) |
| 7 | 8595 break; |
| 8596 | |
| 8597 lookfor = LOOKFOR_CPP_BASECLASS; | |
| 8598 continue; | |
| 8599 } | |
| 8600 | |
| 8601 /* Ignore unterminated lines in between, but | |
| 8602 * reduce indent. */ | |
| 8603 if (amount > cur_amount) | |
| 8604 amount = cur_amount; | |
| 8605 } | |
| 8606 else | |
| 8607 { | |
| 8608 /* | |
| 8609 * Found first unterminated line on a row, may | |
| 8610 * line up with this line, remember its indent | |
| 8611 * 100 + | |
| 8612 * -> here; | |
| 8613 */ | |
| 6691 | 8614 l = ml_get_curline(); |
| 7 | 8615 amount = cur_amount; |
|
7160
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
8616 |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
8617 n = (int)STRLEN(l); |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
8618 if (terminated == ',' && (*skipwhite(l) == ']' |
|
accd3a0e9bf4
commit https://github.com/vim/vim/commit/089af18d1fd0961ff504ee72db0156bbfe509cdf
Christian Brabandt <cb@256bit.org>
parents:
7119
diff
changeset
|
8619 || (n >=2 && l[n - 2] == ']'))) |
| 6691 | 8620 break; |
| 7 | 8621 |
| 8622 /* | |
| 8623 * If previous line ends in ',', check whether we | |
| 8624 * are in an initialization or enum | |
| 8625 * struct xxx = | |
| 8626 * { | |
| 8627 * sizeof a, | |
| 8628 * 124 }; | |
| 8629 * or a normal possible continuation line. | |
| 8630 * but only, of no other statement has been found | |
| 8631 * yet. | |
| 8632 */ | |
| 8633 if (lookfor == LOOKFOR_INITIAL && terminated == ',') | |
| 8634 { | |
| 6030 | 8635 if (curbuf->b_ind_js) |
| 8636 { | |
| 8637 /* Search for a line ending in a comma | |
| 8638 * and line up with the line below it | |
| 8639 * (could be the current line). | |
| 8640 * some = [ | |
| 8641 * 1, <- line up here | |
| 8642 * 2, | |
| 8643 * some = [ | |
| 8644 * 3 + <- line up here | |
| 8645 * 4 * | |
| 8646 * 5, | |
| 8647 * 6, | |
| 8648 */ | |
| 6691 | 8649 if (cin_iscomment(skipwhite(l))) |
| 8650 break; | |
| 8651 lookfor = LOOKFOR_COMMA; | |
| 6030 | 8652 trypos = find_match_char('[', |
| 8653 curbuf->b_ind_maxparen); | |
| 8654 if (trypos != NULL) | |
| 8655 { | |
| 8656 if (trypos->lnum | |
| 8657 == curwin->w_cursor.lnum - 1) | |
| 8658 { | |
| 8659 /* Current line is first inside | |
| 8660 * [], line up with it. */ | |
| 8661 break; | |
| 8662 } | |
| 8663 ourscope = trypos->lnum; | |
| 8664 } | |
| 8665 } | |
| 8666 else | |
| 8667 { | |
| 8668 lookfor = LOOKFOR_ENUM_OR_INIT; | |
| 8669 cont_amount = cin_first_id_amount(); | |
| 8670 } | |
| 7 | 8671 } |
| 8672 else | |
| 8673 { | |
| 8674 if (lookfor == LOOKFOR_INITIAL | |
| 8675 && *l != NUL | |
| 8676 && l[STRLEN(l) - 1] == '\\') | |
| 8677 /* XXX */ | |
| 8678 cont_amount = cin_get_equal_amount( | |
| 8679 curwin->w_cursor.lnum); | |
| 6030 | 8680 if (lookfor != LOOKFOR_TERM |
| 6691 | 8681 && lookfor != LOOKFOR_JS_KEY |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
8682 && lookfor != LOOKFOR_COMMA |
|
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
8683 && raw_string_start != curwin->w_cursor.lnum) |
| 7 | 8684 lookfor = LOOKFOR_UNTERM; |
| 8685 } | |
| 8686 } | |
| 8687 } | |
| 8688 } | |
| 8689 | |
| 8690 /* | |
| 8691 * Check if we are after a while (cond); | |
| 8692 * If so: Ignore until the matching "do". | |
| 8693 */ | |
| 6030 | 8694 else if (cin_iswhileofdo_end(terminated)) /* XXX */ |
| 7 | 8695 { |
| 8696 /* | |
| 8697 * Found an unterminated line after a while ();, line up | |
| 8698 * with the last one. | |
| 8699 * while (cond); | |
| 8700 * 100 + <- line up with this one | |
| 8701 * -> here; | |
| 8702 */ | |
| 8703 if (lookfor == LOOKFOR_UNTERM | |
| 8704 || lookfor == LOOKFOR_ENUM_OR_INIT) | |
| 8705 { | |
| 8706 if (cont_amount > 0) | |
| 8707 amount = cont_amount; | |
| 8708 else | |
| 8709 amount += ind_continuation; | |
| 8710 break; | |
| 8711 } | |
| 8712 | |
| 8713 if (whilelevel == 0) | |
| 8714 { | |
| 8715 lookfor = LOOKFOR_TERM; | |
| 8716 amount = get_indent(); /* XXX */ | |
| 8717 if (theline[0] == '{') | |
| 5438 | 8718 amount += curbuf->b_ind_open_extra; |
| 7 | 8719 } |
| 8720 ++whilelevel; | |
| 8721 } | |
| 8722 | |
| 8723 /* | |
| 8724 * We are after a "normal" statement. | |
| 8725 * If we had another statement we can stop now and use the | |
| 8726 * indent of that other statement. | |
| 8727 * Otherwise the indent of the current statement may be used, | |
| 8728 * search backwards for the next "normal" statement. | |
| 8729 */ | |
| 8730 else | |
| 8731 { | |
| 8732 /* | |
| 8733 * Skip single break line, if before a switch label. It | |
| 8734 * may be lined up with the case label. | |
| 8735 */ | |
| 8736 if (lookfor == LOOKFOR_NOBREAK | |
| 8737 && cin_isbreak(skipwhite(ml_get_curline()))) | |
| 8738 { | |
| 8739 lookfor = LOOKFOR_ANY; | |
| 8740 continue; | |
| 8741 } | |
| 8742 | |
| 8743 /* | |
| 8744 * Handle "do {" line. | |
| 8745 */ | |
| 8746 if (whilelevel > 0) | |
| 8747 { | |
| 8748 l = cin_skipcomment(ml_get_curline()); | |
| 8749 if (cin_isdo(l)) | |
| 8750 { | |
| 8751 amount = get_indent(); /* XXX */ | |
| 8752 --whilelevel; | |
| 8753 continue; | |
| 8754 } | |
| 8755 } | |
| 8756 | |
| 8757 /* | |
| 8758 * Found a terminated line above an unterminated line. Add | |
| 8759 * the amount for a continuation line. | |
| 8760 * x = 1; | |
| 8761 * y = foo + | |
| 8762 * -> here; | |
| 8763 * or | |
| 8764 * int x = 1; | |
| 8765 * int foo, | |
| 8766 * -> here; | |
| 8767 */ | |
| 8768 if (lookfor == LOOKFOR_UNTERM | |
| 8769 || lookfor == LOOKFOR_ENUM_OR_INIT) | |
| 8770 { | |
| 8771 if (cont_amount > 0) | |
| 8772 amount = cont_amount; | |
| 8773 else | |
| 8774 amount += ind_continuation; | |
| 8775 break; | |
| 8776 } | |
| 8777 | |
| 8778 /* | |
| 8779 * Found a terminated line above a terminated line or "if" | |
| 8780 * etc. line. Use the amount of the line below us. | |
| 8781 * x = 1; x = 1; | |
| 8782 * if (asdf) y = 2; | |
| 8783 * while (asdf) ->here; | |
| 8784 * here; | |
| 8785 * ->foo; | |
| 8786 */ | |
| 8787 if (lookfor == LOOKFOR_TERM) | |
| 8788 { | |
| 8789 if (!lookfor_break && whilelevel == 0) | |
| 8790 break; | |
| 8791 } | |
| 8792 | |
| 8793 /* | |
| 8794 * First line above the one we're indenting is terminated. | |
| 8795 * To know what needs to be done look further backward for | |
| 8796 * a terminated line. | |
| 8797 */ | |
| 8798 else | |
| 8799 { | |
| 8800 /* | |
| 8801 * position the cursor over the rightmost paren, so | |
| 8802 * that matching it will take us back to the start of | |
| 8803 * the line. Helps for: | |
| 8804 * func(asdr, | |
| 8805 * asdfasdf); | |
| 8806 * here; | |
| 8807 */ | |
| 8808 term_again: | |
| 8809 l = ml_get_curline(); | |
| 8810 if (find_last_paren(l, '(', ')') | |
| 5438 | 8811 && (trypos = find_match_paren( |
| 5442 | 8812 curbuf->b_ind_maxparen)) != NULL) |
| 7 | 8813 { |
| 8814 /* | |
| 8815 * Check if we are on a case label now. This is | |
| 8816 * handled above. | |
| 8817 * case xx: if ( asdf && | |
| 8818 * asdf) | |
| 8819 */ | |
| 1550 | 8820 curwin->w_cursor = *trypos; |
| 7 | 8821 l = ml_get_curline(); |
|
2297
5ffe000a9ecf
Improve Javascript indenting. Add "J" flag to 'cino'. (Hari Kumar G)
Bram Moolenaar <bram@vim.org>
parents:
2288
diff
changeset
|
8822 if (cin_iscase(l, FALSE) || cin_isscopedecl(l)) |
| 7 | 8823 { |
| 8824 ++curwin->w_cursor.lnum; | |
| 1550 | 8825 curwin->w_cursor.col = 0; |
| 7 | 8826 continue; |
| 8827 } | |
| 8828 } | |
| 8829 | |
| 8830 /* When aligning with the case statement, don't align | |
| 8831 * with a statement after it. | |
| 8832 * case 1: { <-- don't use this { position | |
| 8833 * stat; | |
| 8834 * } | |
| 8835 * case 2: | |
| 8836 * stat; | |
| 8837 * } | |
| 8838 */ | |
| 5438 | 8839 iscase = (curbuf->b_ind_keep_case_label |
| 8840 && cin_iscase(l, FALSE)); | |
| 7 | 8841 |
| 8842 /* | |
| 8843 * Get indent and pointer to text for current line, | |
| 8844 * ignoring any jump label. | |
| 8845 */ | |
| 5442 | 8846 amount = skip_label(curwin->w_cursor.lnum, &l); |
| 7 | 8847 |
| 8848 if (theline[0] == '{') | |
| 5438 | 8849 amount += curbuf->b_ind_open_extra; |
| 8850 /* See remark above: "Only add b_ind_open_extra.." */ | |
| 827 | 8851 l = skipwhite(l); |
| 8852 if (*l == '{') | |
| 5438 | 8853 amount -= curbuf->b_ind_open_extra; |
| 7 | 8854 lookfor = iscase ? LOOKFOR_ANY : LOOKFOR_TERM; |
| 8855 | |
| 8856 /* | |
| 827 | 8857 * When a terminated line starts with "else" skip to |
| 8858 * the matching "if": | |
| 8859 * else 3; | |
| 856 | 8860 * indent this; |
| 827 | 8861 * Need to use the scope of this "else". XXX |
| 8862 * If whilelevel != 0 continue looking for a "do {". | |
| 8863 */ | |
| 8864 if (lookfor == LOOKFOR_TERM | |
| 8865 && *l != '}' | |
| 8866 && cin_iselse(l) | |
| 8867 && whilelevel == 0) | |
| 8868 { | |
| 5442 | 8869 if ((trypos = find_start_brace()) == NULL |
| 8870 || find_match(LOOKFOR_IF, trypos->lnum) | |
| 8871 == FAIL) | |
| 827 | 8872 break; |
| 8873 continue; | |
| 8874 } | |
| 8875 | |
| 8876 /* | |
| 7 | 8877 * If we're at the end of a block, skip to the start of |
| 8878 * that block. | |
| 8879 */ | |
| 3172 | 8880 l = ml_get_curline(); |
| 5442 | 8881 if (find_last_paren(l, '{', '}') /* XXX */ |
| 8882 && (trypos = find_start_brace()) != NULL) | |
| 7 | 8883 { |
| 1550 | 8884 curwin->w_cursor = *trypos; |
| 7 | 8885 /* if not "else {" check for terminated again */ |
| 8886 /* but skip block for "} else {" */ | |
| 8887 l = cin_skipcomment(ml_get_curline()); | |
| 8888 if (*l == '}' || !cin_iselse(l)) | |
| 8889 goto term_again; | |
| 8890 ++curwin->w_cursor.lnum; | |
| 1550 | 8891 curwin->w_cursor.col = 0; |
| 7 | 8892 } |
| 8893 } | |
| 8894 } | |
| 8895 } | |
| 8896 } | |
| 8897 } | |
| 8898 | |
| 8899 /* add extra indent for a comment */ | |
| 8900 if (cin_iscomment(theline)) | |
| 5438 | 8901 amount += curbuf->b_ind_comment; |
|
2328
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
8902 |
|
15379284e55a
Add the 'L' item to 'cinoptions'. (Manuel Konig)
Bram Moolenaar <bram@vim.org>
parents:
2322
diff
changeset
|
8903 /* subtract extra left-shift for jump labels */ |
| 5438 | 8904 if (curbuf->b_ind_jump_label > 0 && original_line_islabel) |
| 8905 amount -= curbuf->b_ind_jump_label; | |
| 6971 | 8906 |
| 8907 goto theend; | |
| 8908 } | |
| 8909 | |
| 8910 /* | |
| 8911 * ok -- we're not inside any sort of structure at all! | |
| 8912 * | |
| 8913 * This means we're at the top level, and everything should | |
| 8914 * basically just match where the previous line is, except | |
| 8915 * for the lines immediately following a function declaration, | |
| 8916 * which are K&R-style parameters and need to be indented. | |
| 8917 * | |
| 8918 * if our line starts with an open brace, forget about any | |
| 8919 * prevailing indent and make sure it looks like the start | |
| 8920 * of a function | |
| 8921 */ | |
| 8922 | |
| 8923 if (theline[0] == '{') | |
| 8924 { | |
| 8925 amount = curbuf->b_ind_first_open; | |
| 8926 goto theend; | |
| 8927 } | |
| 8928 | |
| 8929 /* | |
| 8930 * If the NEXT line is a function declaration, the current | |
| 8931 * line needs to be indented as a function type spec. | |
| 8932 * Don't do this if the current line looks like a comment or if the | |
| 8933 * current line is terminated, ie. ends in ';', or if the current line | |
| 8934 * contains { or }: "void f() {\n if (1)" | |
| 8935 */ | |
| 8936 if (cur_curpos.lnum < curbuf->b_ml.ml_line_count | |
| 8937 && !cin_nocode(theline) | |
| 8938 && vim_strchr(theline, '{') == NULL | |
| 8939 && vim_strchr(theline, '}') == NULL | |
| 8940 && !cin_ends_in(theline, (char_u *)":", NULL) | |
| 8941 && !cin_ends_in(theline, (char_u *)",", NULL) | |
| 8942 && cin_isfuncdecl(NULL, cur_curpos.lnum + 1, | |
| 8943 cur_curpos.lnum + 1) | |
| 8944 && !cin_isterminated(theline, FALSE, TRUE)) | |
| 8945 { | |
| 8946 amount = curbuf->b_ind_func_type; | |
| 8947 goto theend; | |
| 8948 } | |
| 8949 | |
| 8950 /* search backwards until we find something we recognize */ | |
| 8951 amount = 0; | |
| 8952 curwin->w_cursor = cur_curpos; | |
| 8953 while (curwin->w_cursor.lnum > 1) | |
| 8954 { | |
| 8955 curwin->w_cursor.lnum--; | |
| 8956 curwin->w_cursor.col = 0; | |
| 8957 | |
| 8958 l = ml_get_curline(); | |
| 8959 | |
| 7 | 8960 /* |
| 6971 | 8961 * If we're in a comment or raw string now, skip to the start |
| 8962 * of it. | |
| 8963 */ /* XXX */ | |
|
12238
0066a7e178bc
patch 8.0.0999: indenting raw C++ strings is wrong
Christian Brabandt <cb@256bit.org>
parents:
12005
diff
changeset
|
8964 if ((trypos = ind_find_start_CORS(NULL)) != NULL) |
| 6971 | 8965 { |
| 8966 curwin->w_cursor.lnum = trypos->lnum + 1; | |
| 8967 curwin->w_cursor.col = 0; | |
| 8968 continue; | |
| 8969 } | |
| 8970 | |
| 8971 /* | |
| 8972 * Are we at the start of a cpp base class declaration or | |
| 8973 * constructor initialization? | |
| 8974 */ /* XXX */ | |
| 8975 n = FALSE; | |
| 8976 if (curbuf->b_ind_cpp_baseclass != 0 && theline[0] != '{') | |
| 8977 { | |
| 8978 n = cin_is_cpp_baseclass(&cache_cpp_baseclass); | |
| 8979 l = ml_get_curline(); | |
| 8980 } | |
| 8981 if (n) | |
| 8982 { | |
| 8983 /* XXX */ | |
| 8984 amount = get_baseclass_amount(cache_cpp_baseclass.lpos.col); | |
| 8985 break; | |
| 7 | 8986 } |
| 8987 | |
| 8988 /* | |
| 6971 | 8989 * Skip preprocessor directives and blank lines. |
| 8990 */ | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
8991 if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum, &amount)) |
| 6971 | 8992 continue; |
| 8993 | |
| 8994 if (cin_nocode(l)) | |
| 8995 continue; | |
| 8996 | |
| 8997 /* | |
| 8998 * If the previous line ends in ',', use one level of | |
| 8999 * indentation: | |
| 9000 * int foo, | |
| 9001 * bar; | |
| 9002 * do this before checking for '}' in case of eg. | |
| 9003 * enum foobar | |
| 9004 * { | |
| 9005 * ... | |
| 9006 * } foo, | |
| 9007 * bar; | |
| 7 | 9008 */ |
| 6971 | 9009 n = 0; |
| 9010 if (cin_ends_in(l, (char_u *)",", NULL) | |
| 9011 || (*l != NUL && (n = l[STRLEN(l) - 1]) == '\\')) | |
| 9012 { | |
| 9013 /* take us back to opening paren */ | |
| 9014 if (find_last_paren(l, '(', ')') | |
| 9015 && (trypos = find_match_paren( | |
| 9016 curbuf->b_ind_maxparen)) != NULL) | |
| 9017 curwin->w_cursor = *trypos; | |
| 9018 | |
| 9019 /* For a line ending in ',' that is a continuation line go | |
| 9020 * back to the first line with a backslash: | |
| 9021 * char *foo = "bla\ | |
| 9022 * bla", | |
| 9023 * here; | |
| 9024 */ | |
| 9025 while (n == 0 && curwin->w_cursor.lnum > 1) | |
| 9026 { | |
| 9027 l = ml_get(curwin->w_cursor.lnum - 1); | |
| 9028 if (*l == NUL || l[STRLEN(l) - 1] != '\\') | |
| 9029 break; | |
| 9030 --curwin->w_cursor.lnum; | |
| 9031 curwin->w_cursor.col = 0; | |
| 9032 } | |
| 9033 | |
| 9034 amount = get_indent(); /* XXX */ | |
| 9035 | |
| 9036 if (amount == 0) | |
| 9037 amount = cin_first_id_amount(); | |
| 9038 if (amount == 0) | |
| 9039 amount = ind_continuation; | |
| 9040 break; | |
| 9041 } | |
| 9042 | |
| 9043 /* | |
| 9044 * If the line looks like a function declaration, and we're | |
| 9045 * not in a comment, put it the left margin. | |
| 9046 */ | |
| 9047 if (cin_isfuncdecl(NULL, cur_curpos.lnum, 0)) /* XXX */ | |
| 9048 break; | |
| 9049 l = ml_get_curline(); | |
| 9050 | |
| 9051 /* | |
| 9052 * Finding the closing '}' of a previous function. Put | |
| 9053 * current line at the left margin. For when 'cino' has "fs". | |
| 9054 */ | |
| 9055 if (*skipwhite(l) == '}') | |
| 9056 break; | |
| 9057 | |
| 9058 /* (matching {) | |
| 9059 * If the previous line ends on '};' (maybe followed by | |
| 9060 * comments) align at column 0. For example: | |
| 9061 * char *string_array[] = { "foo", | |
| 9062 * / * x * / "b};ar" }; / * foobar * / | |
| 9063 */ | |
| 9064 if (cin_ends_in(l, (char_u *)"};", NULL)) | |
| 9065 break; | |
| 9066 | |
| 9067 /* | |
| 9068 * If the previous line ends on '[' we are probably in an | |
| 9069 * array constant: | |
| 9070 * something = [ | |
| 9071 * 234, <- extra indent | |
| 9072 */ | |
| 9073 if (cin_ends_in(l, (char_u *)"[", NULL)) | |
| 9074 { | |
| 9075 amount = get_indent() + ind_continuation; | |
| 9076 break; | |
| 9077 } | |
| 9078 | |
| 9079 /* | |
| 9080 * Find a line only has a semicolon that belongs to a previous | |
| 9081 * line ending in '}', e.g. before an #endif. Don't increase | |
| 9082 * indent then. | |
| 9083 */ | |
| 9084 if (*(look = skipwhite(l)) == ';' && cin_nocode(look + 1)) | |
| 9085 { | |
| 9086 pos_T curpos_save = curwin->w_cursor; | |
| 7 | 9087 |
| 9088 while (curwin->w_cursor.lnum > 1) | |
| 9089 { | |
| 6971 | 9090 look = ml_get(--curwin->w_cursor.lnum); |
| 9091 if (!(cin_nocode(look) || cin_ispreproc_cont( | |
|
10516
09bb1836cdb5
commit https://github.com/vim/vim/commit/c6aa475a27e3ed1645446b014c32ebf68d005d49
Christian Brabandt <cb@256bit.org>
parents:
10396
diff
changeset
|
9092 &look, &curwin->w_cursor.lnum, &amount))) |
| 7 | 9093 break; |
| 6971 | 9094 } |
| 9095 if (curwin->w_cursor.lnum > 0 | |
| 9096 && cin_ends_in(look, (char_u *)"}", NULL)) | |
| 9097 break; | |
| 9098 | |
| 9099 curwin->w_cursor = curpos_save; | |
| 9100 } | |
| 9101 | |
| 9102 /* | |
| 9103 * If the PREVIOUS line is a function declaration, the current | |
| 9104 * line (and the ones that follow) needs to be indented as | |
| 9105 * parameters. | |
| 9106 */ | |
| 9107 if (cin_isfuncdecl(&l, curwin->w_cursor.lnum, 0)) | |
| 9108 { | |
| 9109 amount = curbuf->b_ind_param; | |
| 9110 break; | |
| 9111 } | |
| 9112 | |
| 9113 /* | |
| 9114 * If the previous line ends in ';' and the line before the | |
| 9115 * previous line ends in ',' or '\', ident to column zero: | |
| 9116 * int foo, | |
| 9117 * bar; | |
| 9118 * indent_to_0 here; | |
| 9119 */ | |
| 9120 if (cin_ends_in(l, (char_u *)";", NULL)) | |
| 9121 { | |
| 9122 l = ml_get(curwin->w_cursor.lnum - 1); | |
| 9123 if (cin_ends_in(l, (char_u *)",", NULL) | |
| 9124 || (*l != NUL && l[STRLEN(l) - 1] == '\\')) | |
| 7 | 9125 break; |
| 6971 | 9126 l = ml_get_curline(); |
| 9127 } | |
| 9128 | |
| 9129 /* | |
| 9130 * Doesn't look like anything interesting -- so just | |
| 9131 * use the indent of this line. | |
| 9132 * | |
| 9133 * Position the cursor over the rightmost paren, so that | |
| 9134 * matching it will take us back to the start of the line. | |
| 9135 */ | |
| 9136 find_last_paren(l, '(', ')'); | |
| 9137 | |
| 9138 if ((trypos = find_match_paren(curbuf->b_ind_maxparen)) != NULL) | |
| 9139 curwin->w_cursor = *trypos; | |
| 9140 amount = get_indent(); /* XXX */ | |
| 9141 break; | |
| 9142 } | |
| 9143 | |
| 9144 /* add extra indent for a comment */ | |
| 9145 if (cin_iscomment(theline)) | |
| 9146 amount += curbuf->b_ind_comment; | |
| 9147 | |
| 9148 /* add extra indent if the previous line ended in a backslash: | |
| 9149 * "asdfasdf\ | |
| 9150 * here"; | |
| 9151 * char *foo = "asdf\ | |
| 9152 * here"; | |
| 9153 */ | |
| 9154 if (cur_curpos.lnum > 1) | |
| 9155 { | |
| 9156 l = ml_get(cur_curpos.lnum - 1); | |
| 9157 if (*l != NUL && l[STRLEN(l) - 1] == '\\') | |
| 9158 { | |
| 9159 cur_amount = cin_get_equal_amount(cur_curpos.lnum - 1); | |
| 9160 if (cur_amount > 0) | |
| 9161 amount = cur_amount; | |
| 9162 else if (cur_amount == 0) | |
| 9163 amount += ind_continuation; | |
| 7 | 9164 } |
| 9165 } | |
| 9166 | |
| 9167 theend: | |
| 6971 | 9168 if (amount < 0) |
| 9169 amount = 0; | |
| 9170 | |
| 9171 laterend: | |
| 7 | 9172 /* put the cursor back where it belongs */ |
| 9173 curwin->w_cursor = cur_curpos; | |
| 9174 | |
| 9175 vim_free(linecopy); | |
| 9176 | |
| 9177 return amount; | |
| 9178 } | |
| 9179 | |
| 9180 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9181 find_match(int lookfor, linenr_T ourscope) |
| 7 | 9182 { |
| 9183 char_u *look; | |
| 9184 pos_T *theirscope; | |
| 9185 char_u *mightbeif; | |
| 9186 int elselevel; | |
| 9187 int whilelevel; | |
| 9188 | |
| 9189 if (lookfor == LOOKFOR_IF) | |
| 9190 { | |
| 9191 elselevel = 1; | |
| 9192 whilelevel = 0; | |
| 9193 } | |
| 9194 else | |
| 9195 { | |
| 9196 elselevel = 0; | |
| 9197 whilelevel = 1; | |
| 9198 } | |
| 9199 | |
| 9200 curwin->w_cursor.col = 0; | |
| 9201 | |
| 9202 while (curwin->w_cursor.lnum > ourscope + 1) | |
| 9203 { | |
| 9204 curwin->w_cursor.lnum--; | |
| 9205 curwin->w_cursor.col = 0; | |
| 9206 | |
| 9207 look = cin_skipcomment(ml_get_curline()); | |
| 9208 if (cin_iselse(look) | |
| 9209 || cin_isif(look) | |
| 9210 || cin_isdo(look) /* XXX */ | |
| 5442 | 9211 || cin_iswhileofdo(look, curwin->w_cursor.lnum)) |
| 7 | 9212 { |
| 9213 /* | |
| 9214 * if we've gone outside the braces entirely, | |
| 9215 * we must be out of scope... | |
| 9216 */ | |
| 5442 | 9217 theirscope = find_start_brace(); /* XXX */ |
| 7 | 9218 if (theirscope == NULL) |
| 9219 break; | |
| 9220 | |
| 9221 /* | |
| 9222 * and if the brace enclosing this is further | |
| 9223 * back than the one enclosing the else, we're | |
| 9224 * out of luck too. | |
| 9225 */ | |
| 9226 if (theirscope->lnum < ourscope) | |
| 9227 break; | |
| 9228 | |
| 9229 /* | |
| 9230 * and if they're enclosed in a *deeper* brace, | |
| 9231 * then we can ignore it because it's in a | |
| 9232 * different scope... | |
| 9233 */ | |
| 9234 if (theirscope->lnum > ourscope) | |
| 9235 continue; | |
| 9236 | |
| 9237 /* | |
| 9238 * if it was an "else" (that's not an "else if") | |
| 9239 * then we need to go back to another if, so | |
| 9240 * increment elselevel | |
| 9241 */ | |
| 9242 look = cin_skipcomment(ml_get_curline()); | |
| 9243 if (cin_iselse(look)) | |
| 9244 { | |
| 9245 mightbeif = cin_skipcomment(look + 4); | |
| 9246 if (!cin_isif(mightbeif)) | |
| 9247 ++elselevel; | |
| 9248 continue; | |
| 9249 } | |
| 9250 | |
| 9251 /* | |
| 9252 * if it was a "while" then we need to go back to | |
| 9253 * another "do", so increment whilelevel. XXX | |
| 9254 */ | |
| 5442 | 9255 if (cin_iswhileofdo(look, curwin->w_cursor.lnum)) |
| 7 | 9256 { |
| 9257 ++whilelevel; | |
| 9258 continue; | |
| 9259 } | |
| 9260 | |
| 9261 /* If it's an "if" decrement elselevel */ | |
| 9262 look = cin_skipcomment(ml_get_curline()); | |
| 9263 if (cin_isif(look)) | |
| 9264 { | |
| 9265 elselevel--; | |
| 9266 /* | |
| 9267 * When looking for an "if" ignore "while"s that | |
| 9268 * get in the way. | |
| 9269 */ | |
| 9270 if (elselevel == 0 && lookfor == LOOKFOR_IF) | |
| 9271 whilelevel = 0; | |
| 9272 } | |
| 9273 | |
| 9274 /* If it's a "do" decrement whilelevel */ | |
| 9275 if (cin_isdo(look)) | |
| 9276 whilelevel--; | |
| 9277 | |
| 9278 /* | |
| 9279 * if we've used up all the elses, then | |
| 9280 * this must be the if that we want! | |
| 9281 * match the indent level of that if. | |
| 9282 */ | |
| 9283 if (elselevel <= 0 && whilelevel <= 0) | |
| 9284 { | |
| 9285 return OK; | |
| 9286 } | |
| 9287 } | |
| 9288 } | |
| 9289 return FAIL; | |
| 9290 } | |
| 9291 | |
| 9292 # if defined(FEAT_EVAL) || defined(PROTO) | |
| 9293 /* | |
| 9294 * Get indent level from 'indentexpr'. | |
| 9295 */ | |
| 9296 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9297 get_expr_indent(void) |
| 7 | 9298 { |
|
11384
b200e14e7836
patch 8.0.0577: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
11380
diff
changeset
|
9299 int indent = -1; |
|
11380
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9300 char_u *inde_copy; |
| 4117 | 9301 pos_T save_pos; |
| 9302 colnr_T save_curswant; | |
| 9303 int save_set_curswant; | |
| 7 | 9304 int save_State; |
| 681 | 9305 int use_sandbox = was_set_insecurely((char_u *)"indentexpr", |
| 9306 OPT_LOCAL); | |
| 7 | 9307 |
| 4117 | 9308 /* Save and restore cursor position and curswant, in case it was changed |
| 9309 * via :normal commands */ | |
| 9310 save_pos = curwin->w_cursor; | |
| 9311 save_curswant = curwin->w_curswant; | |
| 9312 save_set_curswant = curwin->w_set_curswant; | |
| 7 | 9313 set_vim_var_nr(VV_LNUM, curwin->w_cursor.lnum); |
| 634 | 9314 if (use_sandbox) |
| 9315 ++sandbox; | |
| 9316 ++textlock; | |
|
11380
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9317 |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9318 /* Need to make a copy, the 'indentexpr' option could be changed while |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9319 * evaluating it. */ |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9320 inde_copy = vim_strsave(curbuf->b_p_inde); |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9321 if (inde_copy != NULL) |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9322 { |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9323 indent = (int)eval_to_number(inde_copy); |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9324 vim_free(inde_copy); |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9325 } |
|
2334a8ae9ff6
patch 8.0.0575: using freed memory when resetting 'indentexpr'
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9326 |
| 634 | 9327 if (use_sandbox) |
| 9328 --sandbox; | |
| 9329 --textlock; | |
| 7 | 9330 |
| 9331 /* Restore the cursor position so that 'indentexpr' doesn't need to. | |
| 9332 * Pretend to be in Insert mode, allow cursor past end of line for "o" | |
| 9333 * command. */ | |
| 9334 save_State = State; | |
| 9335 State = INSERT; | |
| 4117 | 9336 curwin->w_cursor = save_pos; |
| 9337 curwin->w_curswant = save_curswant; | |
| 9338 curwin->w_set_curswant = save_set_curswant; | |
| 7 | 9339 check_cursor(); |
| 9340 State = save_State; | |
| 9341 | |
| 9342 /* If there is an error, just keep the current indent. */ | |
| 9343 if (indent < 0) | |
| 9344 indent = get_indent(); | |
| 9345 | |
| 9346 return indent; | |
| 9347 } | |
| 9348 # endif | |
| 9349 | |
| 9350 #endif /* FEAT_CINDENT */ | |
| 9351 | |
| 9352 #if defined(FEAT_LISP) || defined(PROTO) | |
| 9353 | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
9354 static int lisp_match(char_u *p); |
| 7 | 9355 |
| 9356 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9357 lisp_match(char_u *p) |
| 7 | 9358 { |
| 9359 char_u buf[LSIZE]; | |
| 9360 int len; | |
| 5712 | 9361 char_u *word = *curbuf->b_p_lw != NUL ? curbuf->b_p_lw : p_lispwords; |
| 7 | 9362 |
| 9363 while (*word != NUL) | |
| 9364 { | |
| 9365 (void)copy_option_part(&word, buf, LSIZE, ","); | |
| 9366 len = (int)STRLEN(buf); | |
| 9367 if (STRNCMP(buf, p, len) == 0 && p[len] == ' ') | |
| 9368 return TRUE; | |
| 9369 } | |
| 9370 return FALSE; | |
| 9371 } | |
| 9372 | |
| 9373 /* | |
| 9374 * When 'p' is present in 'cpoptions, a Vi compatible method is used. | |
| 9375 * The incompatible newer method is quite a bit better at indenting | |
| 9376 * code in lisp-like languages than the traditional one; it's still | |
| 9377 * mostly heuristics however -- Dirk van Deun, dirk@rave.org | |
| 9378 * | |
| 9379 * TODO: | |
| 9380 * Findmatch() should be adapted for lisp, also to make showmatch | |
| 9381 * work correctly: now (v5.3) it seems all C/C++ oriented: | |
| 9382 * - it does not recognize the #\( and #\) notations as character literals | |
| 9383 * - it doesn't know about comments starting with a semicolon | |
| 9384 * - it incorrectly interprets '(' as a character literal | |
| 9385 * All this messes up get_lisp_indent in some rare cases. | |
| 14 | 9386 * Update from Sergey Khorev: |
| 9387 * I tried to fix the first two issues. | |
| 7 | 9388 */ |
| 9389 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9390 get_lisp_indent(void) |
| 7 | 9391 { |
| 14 | 9392 pos_T *pos, realpos, paren; |
| 7 | 9393 int amount; |
| 9394 char_u *that; | |
| 9395 colnr_T col; | |
| 9396 colnr_T firsttry; | |
| 9397 int parencount, quotecount; | |
| 9398 int vi_lisp; | |
| 9399 | |
| 9400 /* Set vi_lisp to use the vi-compatible method */ | |
| 9401 vi_lisp = (vim_strchr(p_cpo, CPO_LISP) != NULL); | |
| 9402 | |
| 9403 realpos = curwin->w_cursor; | |
| 9404 curwin->w_cursor.col = 0; | |
| 9405 | |
| 14 | 9406 if ((pos = findmatch(NULL, '(')) == NULL) |
| 9407 pos = findmatch(NULL, '['); | |
| 9408 else | |
| 9409 { | |
| 9410 paren = *pos; | |
| 9411 pos = findmatch(NULL, '['); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11087
diff
changeset
|
9412 if (pos == NULL || LT_POSP(pos, &paren)) |
| 14 | 9413 pos = &paren; |
| 9414 } | |
| 9415 if (pos != NULL) | |
| 7 | 9416 { |
| 9417 /* Extra trick: Take the indent of the first previous non-white | |
| 9418 * line that is at the same () level. */ | |
| 9419 amount = -1; | |
| 9420 parencount = 0; | |
| 9421 | |
| 9422 while (--curwin->w_cursor.lnum >= pos->lnum) | |
| 9423 { | |
| 9424 if (linewhite(curwin->w_cursor.lnum)) | |
| 9425 continue; | |
| 9426 for (that = ml_get_curline(); *that != NUL; ++that) | |
| 9427 { | |
| 9428 if (*that == ';') | |
| 9429 { | |
| 9430 while (*(that + 1) != NUL) | |
| 9431 ++that; | |
| 9432 continue; | |
| 9433 } | |
| 9434 if (*that == '\\') | |
| 9435 { | |
| 9436 if (*(that + 1) != NUL) | |
| 9437 ++that; | |
| 9438 continue; | |
| 9439 } | |
| 9440 if (*that == '"' && *(that + 1) != NUL) | |
| 9441 { | |
| 983 | 9442 while (*++that && *that != '"') |
| 9443 { | |
| 9444 /* skipping escaped characters in the string */ | |
| 9445 if (*that == '\\') | |
| 9446 { | |
| 9447 if (*++that == NUL) | |
| 9448 break; | |
| 9449 if (that[1] == NUL) | |
| 9450 { | |
| 9451 ++that; | |
| 9452 break; | |
| 9453 } | |
| 9454 } | |
| 9455 } | |
| 7 | 9456 } |
| 14 | 9457 if (*that == '(' || *that == '[') |
| 7 | 9458 ++parencount; |
| 14 | 9459 else if (*that == ')' || *that == ']') |
| 7 | 9460 --parencount; |
| 9461 } | |
| 9462 if (parencount == 0) | |
| 9463 { | |
| 9464 amount = get_indent(); | |
| 9465 break; | |
| 9466 } | |
| 9467 } | |
| 9468 | |
| 9469 if (amount == -1) | |
| 9470 { | |
| 9471 curwin->w_cursor.lnum = pos->lnum; | |
| 9472 curwin->w_cursor.col = pos->col; | |
| 9473 col = pos->col; | |
| 9474 | |
| 9475 that = ml_get_curline(); | |
| 9476 | |
| 9477 if (vi_lisp && get_indent() == 0) | |
| 9478 amount = 2; | |
| 9479 else | |
| 9480 { | |
| 5995 | 9481 char_u *line = that; |
| 9482 | |
| 7 | 9483 amount = 0; |
| 9484 while (*that && col) | |
| 9485 { | |
| 5995 | 9486 amount += lbr_chartabsize_adv(line, &that, (colnr_T)amount); |
| 7 | 9487 col--; |
| 9488 } | |
| 9489 | |
| 9490 /* | |
| 9491 * Some keywords require "body" indenting rules (the | |
| 9492 * non-standard-lisp ones are Scheme special forms): | |
| 9493 * | |
| 9494 * (let ((a 1)) instead (let ((a 1)) | |
| 9495 * (...)) of (...)) | |
| 9496 */ | |
| 9497 | |
| 14 | 9498 if (!vi_lisp && (*that == '(' || *that == '[') |
| 9499 && lisp_match(that + 1)) | |
| 7 | 9500 amount += 2; |
| 9501 else | |
| 9502 { | |
| 9503 that++; | |
| 9504 amount++; | |
| 9505 firsttry = amount; | |
| 9506 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
9507 while (VIM_ISWHITE(*that)) |
| 7 | 9508 { |
| 5995 | 9509 amount += lbr_chartabsize(line, that, (colnr_T)amount); |
| 7 | 9510 ++that; |
| 9511 } | |
| 9512 | |
| 9513 if (*that && *that != ';') /* not a comment line */ | |
| 9514 { | |
| 1532 | 9515 /* test *that != '(' to accommodate first let/do |
| 7 | 9516 * argument if it is more than one line */ |
| 14 | 9517 if (!vi_lisp && *that != '(' && *that != '[') |
| 7 | 9518 firsttry++; |
| 9519 | |
| 9520 parencount = 0; | |
| 9521 quotecount = 0; | |
| 9522 | |
| 9523 if (vi_lisp | |
| 9524 || (*that != '"' | |
| 9525 && *that != '\'' | |
| 9526 && *that != '#' | |
| 9527 && (*that < '0' || *that > '9'))) | |
| 9528 { | |
| 9529 while (*that | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
9530 && (!VIM_ISWHITE(*that) |
| 7 | 9531 || quotecount |
| 9532 || parencount) | |
| 14 | 9533 && (!((*that == '(' || *that == '[') |
| 7 | 9534 && !quotecount |
| 9535 && !parencount | |
| 9536 && vi_lisp))) | |
| 9537 { | |
| 9538 if (*that == '"') | |
| 9539 quotecount = !quotecount; | |
| 14 | 9540 if ((*that == '(' || *that == '[') |
| 9541 && !quotecount) | |
| 7 | 9542 ++parencount; |
| 14 | 9543 if ((*that == ')' || *that == ']') |
| 9544 && !quotecount) | |
| 7 | 9545 --parencount; |
| 9546 if (*that == '\\' && *(that+1) != NUL) | |
| 5995 | 9547 amount += lbr_chartabsize_adv( |
| 9548 line, &that, (colnr_T)amount); | |
| 9549 amount += lbr_chartabsize_adv( | |
| 9550 line, &that, (colnr_T)amount); | |
| 7 | 9551 } |
| 9552 } | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
9553 while (VIM_ISWHITE(*that)) |
| 7 | 9554 { |
| 5995 | 9555 amount += lbr_chartabsize( |
| 9556 line, that, (colnr_T)amount); | |
| 7 | 9557 that++; |
| 9558 } | |
| 9559 if (!*that || *that == ';') | |
| 9560 amount = firsttry; | |
| 9561 } | |
| 9562 } | |
| 9563 } | |
| 9564 } | |
| 9565 } | |
| 9566 else | |
| 14 | 9567 amount = 0; /* no matching '(' or '[' found, use zero indent */ |
| 7 | 9568 |
| 9569 curwin->w_cursor = realpos; | |
| 9570 | |
| 9571 return amount; | |
| 9572 } | |
| 9573 #endif /* FEAT_LISP */ | |
| 9574 | |
| 9575 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9576 prepare_to_exit(void) |
| 7 | 9577 { |
| 39 | 9578 #if defined(SIGHUP) && defined(SIG_IGN) |
| 9579 /* Ignore SIGHUP, because a dropped connection causes a read error, which | |
| 9580 * makes Vim exit and then handling SIGHUP causes various reentrance | |
| 9581 * problems. */ | |
| 36 | 9582 signal(SIGHUP, SIG_IGN); |
| 9583 #endif | |
| 9584 | |
| 7 | 9585 #ifdef FEAT_GUI |
| 9586 if (gui.in_use) | |
| 9587 { | |
| 9588 gui.dying = TRUE; | |
| 9589 out_trash(); /* trash any pending output */ | |
| 9590 } | |
| 9591 else | |
| 9592 #endif | |
| 9593 { | |
| 9594 windgoto((int)Rows - 1, 0); | |
| 9595 | |
| 9596 /* | |
| 9597 * Switch terminal mode back now, so messages end up on the "normal" | |
| 9598 * screen (if there are two screens). | |
| 9599 */ | |
| 9600 settmode(TMODE_COOK); | |
|
10264
c036c0f636d5
commit https://github.com/vim/vim/commit/cea912af725c54f4727a0565e31661f6b29c6bb1
Christian Brabandt <cb@256bit.org>
parents:
10180
diff
changeset
|
9601 stoptermcap(); |
| 7 | 9602 out_flush(); |
| 9603 } | |
| 9604 } | |
| 9605 | |
| 9606 /* | |
| 9607 * Preserve files and exit. | |
| 9608 * When called IObuff must contain a message. | |
| 5338 | 9609 * NOTE: This may be called from deathtrap() in a signal handler, avoid unsafe |
| 9610 * functions, such as allocating memory. | |
| 7 | 9611 */ |
| 9612 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9613 preserve_exit(void) |
| 7 | 9614 { |
| 9615 buf_T *buf; | |
| 9616 | |
| 9617 prepare_to_exit(); | |
| 9618 | |
| 625 | 9619 /* Setting this will prevent free() calls. That avoids calling free() |
| 9620 * recursively when free() was invoked with a bad pointer. */ | |
| 9621 really_exiting = TRUE; | |
| 9622 | |
| 7 | 9623 out_str(IObuff); |
| 9624 screen_start(); /* don't know where cursor is now */ | |
| 9625 out_flush(); | |
| 9626 | |
| 9627 ml_close_notmod(); /* close all not-modified buffers */ | |
| 9628 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9536
diff
changeset
|
9629 FOR_ALL_BUFFERS(buf) |
| 7 | 9630 { |
| 9631 if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) | |
| 9632 { | |
| 5338 | 9633 OUT_STR("Vim: preserving files...\n"); |
| 7 | 9634 screen_start(); /* don't know where cursor is now */ |
| 9635 out_flush(); | |
| 9636 ml_sync_all(FALSE, FALSE); /* preserve all swap files */ | |
| 9637 break; | |
| 9638 } | |
| 9639 } | |
| 9640 | |
| 9641 ml_close_all(FALSE); /* close all memfiles, without deleting */ | |
| 9642 | |
| 5338 | 9643 OUT_STR("Vim: Finished.\n"); |
| 7 | 9644 |
| 9645 getout(1); | |
| 9646 } | |
| 9647 | |
| 9648 /* | |
| 9649 * return TRUE if "fname" exists. | |
| 9650 */ | |
| 9651 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9652 vim_fexists(char_u *fname) |
| 7 | 9653 { |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
9654 stat_T st; |
| 7 | 9655 |
| 9656 if (mch_stat((char *)fname, &st)) | |
| 9657 return FALSE; | |
| 9658 return TRUE; | |
| 9659 } | |
| 9660 | |
| 9661 /* | |
| 9662 * Check for CTRL-C pressed, but only once in a while. | |
| 9663 * Should be used instead of ui_breakcheck() for functions that check for | |
| 9664 * each line in the file. Calling ui_breakcheck() each time takes too much | |
| 9665 * time, because it can be a system call. | |
| 9666 */ | |
| 9667 | |
| 9668 #ifndef BREAKCHECK_SKIP | |
| 9669 # ifdef FEAT_GUI /* assume the GUI only runs on fast computers */ | |
| 9670 # define BREAKCHECK_SKIP 200 | |
| 9671 # else | |
| 9672 # define BREAKCHECK_SKIP 32 | |
| 9673 # endif | |
| 9674 #endif | |
| 9675 | |
| 9676 static int breakcheck_count = 0; | |
| 9677 | |
| 9678 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9679 line_breakcheck(void) |
| 7 | 9680 { |
| 9681 if (++breakcheck_count >= BREAKCHECK_SKIP) | |
| 9682 { | |
| 9683 breakcheck_count = 0; | |
| 9684 ui_breakcheck(); | |
| 9685 } | |
| 9686 } | |
| 9687 | |
| 9688 /* | |
| 9689 * Like line_breakcheck() but check 10 times less often. | |
| 9690 */ | |
| 9691 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9692 fast_breakcheck(void) |
| 7 | 9693 { |
| 9694 if (++breakcheck_count >= BREAKCHECK_SKIP * 10) | |
| 9695 { | |
| 9696 breakcheck_count = 0; | |
| 9697 ui_breakcheck(); | |
| 9698 } | |
| 9699 } | |
| 9700 | |
| 9701 /* | |
| 2016 | 9702 * Invoke expand_wildcards() for one pattern. |
| 9703 * Expand items like "%:h" before the expansion. | |
| 9704 * Returns OK or FAIL. | |
| 9705 */ | |
| 9706 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9707 expand_wildcards_eval( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9708 char_u **pat, /* pointer to input pattern */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9709 int *num_file, /* resulting number of files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9710 char_u ***file, /* array of resulting files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9711 int flags) /* EW_DIR, etc. */ |
| 2016 | 9712 { |
| 9713 int ret = FAIL; | |
| 9714 char_u *eval_pat = NULL; | |
| 9715 char_u *exp_pat = *pat; | |
| 9716 char_u *ignored_msg; | |
| 9717 int usedlen; | |
| 9718 | |
| 9719 if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<') | |
| 9720 { | |
| 9721 ++emsg_off; | |
| 9722 eval_pat = eval_vars(exp_pat, exp_pat, &usedlen, | |
| 9723 NULL, &ignored_msg, NULL); | |
| 9724 --emsg_off; | |
| 9725 if (eval_pat != NULL) | |
| 9726 exp_pat = concat_str(eval_pat, exp_pat + usedlen); | |
| 9727 } | |
| 9728 | |
| 9729 if (exp_pat != NULL) | |
| 9730 ret = expand_wildcards(1, &exp_pat, num_file, file, flags); | |
| 9731 | |
| 9732 if (eval_pat != NULL) | |
| 9733 { | |
| 9734 vim_free(exp_pat); | |
| 9735 vim_free(eval_pat); | |
| 9736 } | |
| 9737 | |
| 9738 return ret; | |
| 9739 } | |
| 9740 | |
| 9741 /* | |
| 7 | 9742 * Expand wildcards. Calls gen_expand_wildcards() and removes files matching |
| 9743 * 'wildignore'. | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9744 * Returns OK or FAIL. When FAIL then "num_files" won't be set. |
| 7 | 9745 */ |
| 9746 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9747 expand_wildcards( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9748 int num_pat, /* number of input patterns */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9749 char_u **pat, /* array of input patterns */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9750 int *num_files, /* resulting number of files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9751 char_u ***files, /* array of resulting files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9752 int flags) /* EW_DIR, etc. */ |
| 7 | 9753 { |
| 9754 int retval; | |
| 9755 int i, j; | |
| 9756 char_u *p; | |
| 9757 int non_suf_match; /* number without matching suffix */ | |
| 9758 | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9759 retval = gen_expand_wildcards(num_pat, pat, num_files, files, flags); |
| 7 | 9760 |
| 9761 /* When keeping all matches, return here */ | |
|
2354
f4440cdd59ae
Fixed: crash with ":find " completion, using uninitialized count.
Bram Moolenaar <bram@vim.org>
parents:
2328
diff
changeset
|
9762 if ((flags & EW_KEEPALL) || retval == FAIL) |
| 7 | 9763 return retval; |
| 9764 | |
| 9765 #ifdef FEAT_WILDIGN | |
| 9766 /* | |
| 9767 * Remove names that match 'wildignore'. | |
| 9768 */ | |
| 9769 if (*p_wig) | |
| 9770 { | |
| 9771 char_u *ffname; | |
| 9772 | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9773 /* check all files in (*files)[] */ |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9774 for (i = 0; i < *num_files; ++i) |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9775 { |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9776 ffname = FullName_save((*files)[i], FALSE); |
| 7 | 9777 if (ffname == NULL) /* out of memory */ |
| 9778 break; | |
| 9779 # ifdef VMS | |
| 9780 vms_remove_version(ffname); | |
| 9781 # endif | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9782 if (match_file_list(p_wig, (*files)[i], ffname)) |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9783 { |
|
10932
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
9784 /* remove this matching file from the list */ |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9785 vim_free((*files)[i]); |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9786 for (j = i; j + 1 < *num_files; ++j) |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9787 (*files)[j] = (*files)[j + 1]; |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9788 --*num_files; |
| 7 | 9789 --i; |
| 9790 } | |
| 9791 vim_free(ffname); | |
| 9792 } | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9793 |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9794 /* If the number of matches is now zero, we fail. */ |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9795 if (*num_files == 0) |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9796 { |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13188
diff
changeset
|
9797 VIM_CLEAR(*files); |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9798 return FAIL; |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9799 } |
| 7 | 9800 } |
| 9801 #endif | |
| 9802 | |
| 9803 /* | |
| 9804 * Move the names where 'suffixes' match to the end. | |
| 9805 */ | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9806 if (*num_files > 1) |
| 7 | 9807 { |
| 9808 non_suf_match = 0; | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9809 for (i = 0; i < *num_files; ++i) |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9810 { |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9811 if (!match_suffix((*files)[i])) |
| 7 | 9812 { |
| 9813 /* | |
| 9814 * Move the name without matching suffix to the front | |
| 9815 * of the list. | |
| 9816 */ | |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9817 p = (*files)[i]; |
| 7 | 9818 for (j = i; j > non_suf_match; --j) |
|
7119
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9819 (*files)[j] = (*files)[j - 1]; |
|
6bc1695b7f11
commit https://github.com/vim/vim/commit/7b256fe7445b46929f660ea74e9090418f857696
Christian Brabandt <cb@256bit.org>
parents:
7066
diff
changeset
|
9820 (*files)[non_suf_match++] = p; |
| 7 | 9821 } |
| 9822 } | |
| 9823 } | |
| 9824 | |
| 9825 return retval; | |
| 9826 } | |
| 9827 | |
| 9828 /* | |
| 9829 * Return TRUE if "fname" matches with an entry in 'suffixes'. | |
| 9830 */ | |
| 9831 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
9832 match_suffix(char_u *fname) |
| 7 | 9833 { |
| 9834 int fnamelen, setsuflen; | |
| 9835 char_u *setsuf; | |
| 9836 #define MAXSUFLEN 30 /* maximum length of a file suffix */ | |
| 9837 char_u suf_buf[MAXSUFLEN]; | |
| 9838 | |
| 9839 fnamelen = (int)STRLEN(fname); | |
| 9840 setsuflen = 0; | |
| 9841 for (setsuf = p_su; *setsuf; ) | |
| 9842 { | |
| 9843 setsuflen = copy_option_part(&setsuf, suf_buf, MAXSUFLEN, ".,"); | |
| 1937 | 9844 if (setsuflen == 0) |
| 9845 { | |
| 9846 char_u *tail = gettail(fname); | |
| 9847 | |
| 9848 /* empty entry: match name without a '.' */ | |
| 9849 if (vim_strchr(tail, '.') == NULL) | |
| 9850 { | |
| 9851 setsuflen = 1; | |
| 9852 break; | |
| 9853 } | |
| 9854 } | |
| 9855 else | |
| 9856 { | |
| 9857 if (fnamelen >= setsuflen | |
| 9858 && fnamencmp(suf_buf, fname + fnamelen - setsuflen, | |
| 9859 (size_t)setsuflen) == 0) | |
| 9860 break; | |
| 9861 setsuflen = 0; | |
| 9862 } | |
| 7 | 9863 } |
| 9864 return (setsuflen != 0); | |
| 9865 } | |
| 9866 | |
| 9867 #if !defined(NO_EXPANDPATH) || defined(PROTO) | |
| 9868 | |
| 9869 # ifdef VIM_BACKTICK | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
9870 static int vim_backtick(char_u *p); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
9871 static int expand_backtick(garray_T *gap, char_u *pat, int flags); |
| 7 | 9872 # endif |
| 9873 | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
9874 # if defined(WIN3264) |
| 7 | 9875 /* |
| 9876 * File name expansion code for MS-DOS, Win16 and Win32. It's here because | |
| 9877 * it's shared between these systems. | |
| 9878 */ | |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
9879 # if defined(PROTO) |
|
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
9880 # define _cdecl |
| 7 | 9881 # else |
| 9882 # ifdef __BORLANDC__ | |
| 9883 # define _cdecl _RTLENTRYF | |
| 9884 # endif | |
| 9885 # endif | |
| 9886 | |
| 9887 /* | |
| 9888 * comparison function for qsort in dos_expandpath() | |
| 9889 */ | |
| 9890 static int _cdecl | |
| 9891 pstrcmp(const void *a, const void *b) | |
| 9892 { | |
| 39 | 9893 return (pathcmp(*(char **)a, *(char **)b, -1)); |
| 7 | 9894 } |
| 9895 | |
| 9896 /* | |
| 445 | 9897 * Recursively expand one path component into all matching files and/or |
| 9898 * directories. Adds matches to "gap". Handles "*", "?", "[a-z]", "**", etc. | |
| 7 | 9899 * Return the number of matches found. |
| 9900 * "path" has backslashes before chars that are not to be expanded, starting | |
| 9901 * at "path[wildoff]". | |
| 445 | 9902 * Return the number of matches found. |
| 9903 * NOTE: much of this is identical to unix_expandpath(), keep in sync! | |
| 7 | 9904 */ |
| 9905 static int | |
| 9906 dos_expandpath( | |
| 9907 garray_T *gap, | |
| 9908 char_u *path, | |
| 9909 int wildoff, | |
| 445 | 9910 int flags, /* EW_* flags */ |
| 1224 | 9911 int didstar) /* expanded "**" once already */ |
| 445 | 9912 { |
| 9913 char_u *buf; | |
| 9914 char_u *path_end; | |
| 9915 char_u *p, *s, *e; | |
| 9916 int start_len = gap->ga_len; | |
| 9917 char_u *pat; | |
| 9918 regmatch_T regmatch; | |
| 9919 int starts_with_dot; | |
| 9920 int matches; | |
| 9921 int len; | |
| 9922 int starstar = FALSE; | |
| 9923 static int stardepth = 0; /* depth for "**" expansion */ | |
| 7 | 9924 WIN32_FIND_DATA fb; |
| 9925 HANDLE hFind = (HANDLE)0; | |
| 9926 # ifdef FEAT_MBYTE | |
| 9927 WIN32_FIND_DATAW wfb; | |
| 9928 WCHAR *wn = NULL; /* UCS-2 name, NULL when not used. */ | |
| 9929 # endif | |
| 9930 char_u *matchname; | |
| 445 | 9931 int ok; |
| 9932 | |
| 9933 /* Expanding "**" may take a long time, check for CTRL-C. */ | |
| 9934 if (stardepth > 0) | |
| 9935 { | |
| 9936 ui_breakcheck(); | |
| 9937 if (got_int) | |
| 9938 return 0; | |
| 9939 } | |
| 7 | 9940 |
|
7186
41885de3d577
commit https://github.com/vim/vim/commit/7314efd87d8c4095229bdc2867a553c36c064918
Christian Brabandt <cb@256bit.org>
parents:
7164
diff
changeset
|
9941 /* Make room for file name. When doing encoding conversion the actual |
|
41885de3d577
commit https://github.com/vim/vim/commit/7314efd87d8c4095229bdc2867a553c36c064918
Christian Brabandt <cb@256bit.org>
parents:
7164
diff
changeset
|
9942 * length may be quite a bit longer, thus use the maximum possible length. */ |
|
41885de3d577
commit https://github.com/vim/vim/commit/7314efd87d8c4095229bdc2867a553c36c064918
Christian Brabandt <cb@256bit.org>
parents:
7164
diff
changeset
|
9943 buf = alloc((int)MAXPATHL); |
| 7 | 9944 if (buf == NULL) |
| 9945 return 0; | |
| 9946 | |
| 9947 /* | |
| 9948 * Find the first part in the path name that contains a wildcard or a ~1. | |
| 9949 * Copy it into buf, including the preceding characters. | |
| 9950 */ | |
| 9951 p = buf; | |
| 9952 s = buf; | |
| 9953 e = NULL; | |
| 9954 path_end = path; | |
| 9955 while (*path_end != NUL) | |
| 9956 { | |
| 9957 /* May ignore a wildcard that has a backslash before it; it will | |
| 9958 * be removed by rem_backslash() or file_pat_to_reg_pat() below. */ | |
| 9959 if (path_end >= path + wildoff && rem_backslash(path_end)) | |
| 9960 *p++ = *path_end++; | |
| 9961 else if (*path_end == '\\' || *path_end == ':' || *path_end == '/') | |
| 9962 { | |
| 9963 if (e != NULL) | |
| 9964 break; | |
| 9965 s = p + 1; | |
| 9966 } | |
| 9967 else if (path_end >= path + wildoff | |
| 9968 && vim_strchr((char_u *)"*?[~", *path_end) != NULL) | |
| 9969 e = p; | |
|
8724
e6d1608ca601
commit https://github.com/vim/vim/commit/780d4c3fff3c06baa3135a9f9739c56a0c280a94
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
9970 # ifdef FEAT_MBYTE |
| 7 | 9971 if (has_mbyte) |
| 9972 { | |
| 474 | 9973 len = (*mb_ptr2len)(path_end); |
| 7 | 9974 STRNCPY(p, path_end, len); |
| 9975 p += len; | |
| 9976 path_end += len; | |
| 9977 } | |
| 9978 else | |
|
8724
e6d1608ca601
commit https://github.com/vim/vim/commit/780d4c3fff3c06baa3135a9f9739c56a0c280a94
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
9979 # endif |
| 7 | 9980 *p++ = *path_end++; |
| 9981 } | |
| 9982 e = p; | |
| 9983 *e = NUL; | |
| 9984 | |
| 9985 /* now we have one wildcard component between s and e */ | |
| 9986 /* Remove backslashes between "wildoff" and the start of the wildcard | |
| 9987 * component. */ | |
| 9988 for (p = buf + wildoff; p < s; ++p) | |
| 9989 if (rem_backslash(p)) | |
| 9990 { | |
| 1624 | 9991 STRMOVE(p, p + 1); |
| 7 | 9992 --e; |
| 9993 --s; | |
| 9994 } | |
| 9995 | |
| 445 | 9996 /* Check for "**" between "s" and "e". */ |
| 9997 for (p = s; p < e; ++p) | |
| 9998 if (p[0] == '*' && p[1] == '*') | |
| 9999 starstar = TRUE; | |
| 10000 | |
|
7635
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10001 starts_with_dot = *s == '.'; |
| 7 | 10002 pat = file_pat_to_reg_pat(s, e, NULL, FALSE); |
| 10003 if (pat == NULL) | |
| 10004 { | |
| 10005 vim_free(buf); | |
| 10006 return 0; | |
| 10007 } | |
| 10008 | |
| 10009 /* compile the regexp into a program */ | |
| 3261 | 10010 if (flags & (EW_NOERROR | EW_NOTWILD)) |
| 2966 | 10011 ++emsg_silent; |
| 7 | 10012 regmatch.rm_ic = TRUE; /* Always ignore case */ |
| 10013 regmatch.regprog = vim_regcomp(pat, RE_MAGIC); | |
| 3261 | 10014 if (flags & (EW_NOERROR | EW_NOTWILD)) |
| 2966 | 10015 --emsg_silent; |
| 7 | 10016 vim_free(pat); |
| 10017 | |
| 3261 | 10018 if (regmatch.regprog == NULL && (flags & EW_NOTWILD) == 0) |
| 7 | 10019 { |
| 10020 vim_free(buf); | |
| 10021 return 0; | |
| 10022 } | |
| 10023 | |
| 10024 /* remember the pattern or file name being looked for */ | |
| 10025 matchname = vim_strsave(s); | |
| 10026 | |
| 445 | 10027 /* If "**" is by itself, this is the first time we encounter it and more |
| 10028 * is following then find matches without any directory. */ | |
| 10029 if (!didstar && stardepth < 100 && starstar && e - s == 2 | |
| 10030 && *path_end == '/') | |
| 10031 { | |
| 10032 STRCPY(s, path_end + 1); | |
| 10033 ++stardepth; | |
| 10034 (void)dos_expandpath(gap, buf, (int)(s - buf), flags, TRUE); | |
| 10035 --stardepth; | |
| 10036 } | |
| 10037 | |
| 7 | 10038 /* Scan all files in the directory with "dir/ *.*" */ |
| 10039 STRCPY(s, "*.*"); | |
| 10040 # ifdef FEAT_MBYTE | |
| 10041 if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) | |
| 10042 { | |
| 10043 /* The active codepage differs from 'encoding'. Attempt using the | |
| 10044 * wide function. If it fails because it is not implemented fall back | |
| 10045 * to the non-wide version (for Windows 98) */ | |
| 1752 | 10046 wn = enc_to_utf16(buf, NULL); |
| 7 | 10047 if (wn != NULL) |
| 10048 { | |
| 10049 hFind = FindFirstFileW(wn, &wfb); | |
| 10050 if (hFind == INVALID_HANDLE_VALUE | |
| 10051 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13188
diff
changeset
|
10052 VIM_CLEAR(wn); |
| 7 | 10053 } |
| 10054 } | |
| 10055 | |
| 10056 if (wn == NULL) | |
| 10057 # endif | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
10058 hFind = FindFirstFile((LPCSTR)buf, &fb); |
| 7 | 10059 ok = (hFind != INVALID_HANDLE_VALUE); |
| 10060 | |
| 10061 while (ok) | |
| 10062 { | |
| 10063 # ifdef FEAT_MBYTE | |
| 10064 if (wn != NULL) | |
| 1752 | 10065 p = utf16_to_enc(wfb.cFileName, NULL); /* p is allocated here */ |
| 7 | 10066 else |
| 10067 # endif | |
| 10068 p = (char_u *)fb.cFileName; | |
| 10069 /* Ignore entries starting with a dot, unless when asked for. Accept | |
| 10070 * all entries found with "matchname". */ | |
|
7635
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10071 if ((p[0] != '.' || starts_with_dot |
|
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10072 || ((flags & EW_DODOT) |
|
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10073 && p[1] != NUL && (p[1] != '.' || p[2] != NUL))) |
| 7 | 10074 && (matchname == NULL |
| 3261 | 10075 || (regmatch.regprog != NULL |
| 10076 && vim_regexec(®match, p, (colnr_T)0)) | |
| 2984 | 10077 || ((flags & EW_NOTWILD) |
| 10078 && fnamencmp(path + (s - buf), p, e - s) == 0))) | |
| 7 | 10079 { |
| 10080 STRCPY(s, p); | |
| 10081 len = (int)STRLEN(buf); | |
| 445 | 10082 |
| 10083 if (starstar && stardepth < 100) | |
| 10084 { | |
| 10085 /* For "**" in the pattern first go deeper in the tree to | |
| 10086 * find matches. */ | |
| 10087 STRCPY(buf + len, "/**"); | |
| 10088 STRCPY(buf + len + 3, path_end); | |
| 10089 ++stardepth; | |
| 10090 (void)dos_expandpath(gap, buf, len + 1, flags, TRUE); | |
| 10091 --stardepth; | |
| 10092 } | |
| 10093 | |
| 7 | 10094 STRCPY(buf + len, path_end); |
| 10095 if (mch_has_exp_wildcard(path_end)) | |
| 10096 { | |
| 10097 /* need to expand another component of the path */ | |
| 10098 /* remove backslashes for the remaining components only */ | |
| 445 | 10099 (void)dos_expandpath(gap, buf, len + 1, flags, FALSE); |
| 7 | 10100 } |
| 10101 else | |
| 10102 { | |
| 10103 /* no more wildcards, check if there is a match */ | |
| 10104 /* remove backslashes for the remaining components only */ | |
| 10105 if (*path_end != 0) | |
| 10106 backslash_halve(buf + len + 1); | |
| 10107 if (mch_getperm(buf) >= 0) /* add existing file */ | |
| 10108 addfile(gap, buf, flags); | |
| 10109 } | |
| 10110 } | |
| 10111 | |
| 10112 # ifdef FEAT_MBYTE | |
| 10113 if (wn != NULL) | |
| 10114 { | |
| 10115 vim_free(p); | |
| 10116 ok = FindNextFileW(hFind, &wfb); | |
| 10117 } | |
| 10118 else | |
| 10119 # endif | |
| 10120 ok = FindNextFile(hFind, &fb); | |
| 10121 | |
| 10122 /* If no more matches and no match was used, try expanding the name | |
| 10123 * itself. Finds the long name of a short filename. */ | |
| 10124 if (!ok && matchname != NULL && gap->ga_len == start_len) | |
| 10125 { | |
| 10126 STRCPY(s, matchname); | |
| 10127 FindClose(hFind); | |
| 10128 # ifdef FEAT_MBYTE | |
| 10129 if (wn != NULL) | |
| 10130 { | |
| 10131 vim_free(wn); | |
| 1752 | 10132 wn = enc_to_utf16(buf, NULL); |
| 7 | 10133 if (wn != NULL) |
| 10134 hFind = FindFirstFileW(wn, &wfb); | |
| 10135 } | |
| 10136 if (wn == NULL) | |
| 10137 # endif | |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
10138 hFind = FindFirstFile((LPCSTR)buf, &fb); |
| 7 | 10139 ok = (hFind != INVALID_HANDLE_VALUE); |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13188
diff
changeset
|
10140 VIM_CLEAR(matchname); |
| 7 | 10141 } |
| 10142 } | |
| 10143 | |
| 10144 FindClose(hFind); | |
| 10145 # ifdef FEAT_MBYTE | |
| 10146 vim_free(wn); | |
| 10147 # endif | |
| 10148 vim_free(buf); | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4752
diff
changeset
|
10149 vim_regfree(regmatch.regprog); |
| 7 | 10150 vim_free(matchname); |
| 10151 | |
| 10152 matches = gap->ga_len - start_len; | |
| 10153 if (matches > 0) | |
| 10154 qsort(((char_u **)gap->ga_data) + start_len, (size_t)matches, | |
| 10155 sizeof(char_u *), pstrcmp); | |
| 10156 return matches; | |
| 10157 } | |
| 10158 | |
| 10159 int | |
| 10160 mch_expandpath( | |
| 10161 garray_T *gap, | |
| 10162 char_u *path, | |
| 10163 int flags) /* EW_* flags */ | |
| 10164 { | |
| 445 | 10165 return dos_expandpath(gap, path, 0, flags, FALSE); |
| 7 | 10166 } |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
10167 # endif /* WIN3264 */ |
| 7 | 10168 |
| 445 | 10169 #if (defined(UNIX) && !defined(VMS)) || defined(USE_UNIXFILENAME) \ |
| 10170 || defined(PROTO) | |
| 10171 /* | |
| 10172 * Unix style wildcard expansion code. | |
| 10173 * It's here because it's used both for Unix and Mac. | |
| 10174 */ | |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10175 static int pstrcmp(const void *, const void *); |
| 445 | 10176 |
| 10177 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10178 pstrcmp(const void *a, const void *b) |
| 445 | 10179 { |
| 10180 return (pathcmp(*(char **)a, *(char **)b, -1)); | |
| 10181 } | |
| 10182 | |
| 10183 /* | |
| 10184 * Recursively expand one path component into all matching files and/or | |
| 10185 * directories. Adds matches to "gap". Handles "*", "?", "[a-z]", "**", etc. | |
| 10186 * "path" has backslashes before chars that are not to be expanded, starting | |
| 10187 * at "path + wildoff". | |
| 10188 * Return the number of matches found. | |
| 10189 * NOTE: much of this is identical to dos_expandpath(), keep in sync! | |
| 10190 */ | |
| 10191 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10192 unix_expandpath( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10193 garray_T *gap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10194 char_u *path, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10195 int wildoff, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10196 int flags, /* EW_* flags */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10197 int didstar) /* expanded "**" once already */ |
| 445 | 10198 { |
| 10199 char_u *buf; | |
| 10200 char_u *path_end; | |
| 10201 char_u *p, *s, *e; | |
| 10202 int start_len = gap->ga_len; | |
| 10203 char_u *pat; | |
| 10204 regmatch_T regmatch; | |
| 10205 int starts_with_dot; | |
| 10206 int matches; | |
| 10207 int len; | |
| 10208 int starstar = FALSE; | |
| 10209 static int stardepth = 0; /* depth for "**" expansion */ | |
| 10210 | |
| 10211 DIR *dirp; | |
| 10212 struct dirent *dp; | |
| 10213 | |
| 10214 /* Expanding "**" may take a long time, check for CTRL-C. */ | |
| 10215 if (stardepth > 0) | |
| 10216 { | |
| 10217 ui_breakcheck(); | |
| 10218 if (got_int) | |
| 10219 return 0; | |
| 10220 } | |
| 10221 | |
| 10222 /* make room for file name */ | |
| 10223 buf = alloc((int)STRLEN(path) + BASENAMELEN + 5); | |
| 10224 if (buf == NULL) | |
| 10225 return 0; | |
| 10226 | |
| 10227 /* | |
| 10228 * Find the first part in the path name that contains a wildcard. | |
| 3505 | 10229 * When EW_ICASE is set every letter is considered to be a wildcard. |
| 445 | 10230 * Copy it into "buf", including the preceding characters. |
| 10231 */ | |
| 10232 p = buf; | |
| 10233 s = buf; | |
| 10234 e = NULL; | |
| 10235 path_end = path; | |
| 10236 while (*path_end != NUL) | |
| 10237 { | |
| 10238 /* May ignore a wildcard that has a backslash before it; it will | |
| 10239 * be removed by rem_backslash() or file_pat_to_reg_pat() below. */ | |
| 10240 if (path_end >= path + wildoff && rem_backslash(path_end)) | |
| 10241 *p++ = *path_end++; | |
| 10242 else if (*path_end == '/') | |
| 10243 { | |
| 10244 if (e != NULL) | |
| 10245 break; | |
| 10246 s = p + 1; | |
| 10247 } | |
| 10248 else if (path_end >= path + wildoff | |
| 3505 | 10249 && (vim_strchr((char_u *)"*?[{~$", *path_end) != NULL |
| 4242 | 10250 || (!p_fic && (flags & EW_ICASE) |
| 10251 && isalpha(PTR2CHAR(path_end))))) | |
| 445 | 10252 e = p; |
| 10253 #ifdef FEAT_MBYTE | |
| 10254 if (has_mbyte) | |
| 10255 { | |
| 474 | 10256 len = (*mb_ptr2len)(path_end); |
| 445 | 10257 STRNCPY(p, path_end, len); |
| 10258 p += len; | |
| 10259 path_end += len; | |
| 10260 } | |
| 10261 else | |
| 10262 #endif | |
| 10263 *p++ = *path_end++; | |
| 10264 } | |
| 10265 e = p; | |
| 10266 *e = NUL; | |
| 10267 | |
| 2984 | 10268 /* Now we have one wildcard component between "s" and "e". */ |
| 445 | 10269 /* Remove backslashes between "wildoff" and the start of the wildcard |
| 10270 * component. */ | |
| 10271 for (p = buf + wildoff; p < s; ++p) | |
| 10272 if (rem_backslash(p)) | |
| 10273 { | |
| 1624 | 10274 STRMOVE(p, p + 1); |
| 445 | 10275 --e; |
| 10276 --s; | |
| 10277 } | |
| 10278 | |
| 10279 /* Check for "**" between "s" and "e". */ | |
| 10280 for (p = s; p < e; ++p) | |
| 10281 if (p[0] == '*' && p[1] == '*') | |
| 10282 starstar = TRUE; | |
| 10283 | |
| 10284 /* convert the file pattern to a regexp pattern */ | |
|
7635
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10285 starts_with_dot = *s == '.'; |
| 445 | 10286 pat = file_pat_to_reg_pat(s, e, NULL, FALSE); |
| 10287 if (pat == NULL) | |
| 10288 { | |
| 10289 vim_free(buf); | |
| 10290 return 0; | |
| 10291 } | |
| 10292 | |
| 10293 /* compile the regexp into a program */ | |
| 2652 | 10294 if (flags & EW_ICASE) |
| 10295 regmatch.rm_ic = TRUE; /* 'wildignorecase' set */ | |
| 10296 else | |
| 4242 | 10297 regmatch.rm_ic = p_fic; /* ignore case when 'fileignorecase' is set */ |
| 3261 | 10298 if (flags & (EW_NOERROR | EW_NOTWILD)) |
| 10299 ++emsg_silent; | |
| 445 | 10300 regmatch.regprog = vim_regcomp(pat, RE_MAGIC); |
| 3261 | 10301 if (flags & (EW_NOERROR | EW_NOTWILD)) |
| 10302 --emsg_silent; | |
| 445 | 10303 vim_free(pat); |
| 10304 | |
| 3261 | 10305 if (regmatch.regprog == NULL && (flags & EW_NOTWILD) == 0) |
| 445 | 10306 { |
| 10307 vim_free(buf); | |
| 10308 return 0; | |
| 10309 } | |
| 10310 | |
| 10311 /* If "**" is by itself, this is the first time we encounter it and more | |
| 10312 * is following then find matches without any directory. */ | |
| 10313 if (!didstar && stardepth < 100 && starstar && e - s == 2 | |
| 10314 && *path_end == '/') | |
| 10315 { | |
| 10316 STRCPY(s, path_end + 1); | |
| 10317 ++stardepth; | |
| 10318 (void)unix_expandpath(gap, buf, (int)(s - buf), flags, TRUE); | |
| 10319 --stardepth; | |
| 10320 } | |
| 10321 | |
| 10322 /* open the directory for scanning */ | |
| 10323 *s = NUL; | |
| 10324 dirp = opendir(*buf == NUL ? "." : (char *)buf); | |
| 10325 | |
| 10326 /* Find all matching entries */ | |
| 10327 if (dirp != NULL) | |
| 10328 { | |
| 10329 for (;;) | |
| 10330 { | |
| 10331 dp = readdir(dirp); | |
| 10332 if (dp == NULL) | |
| 10333 break; | |
|
7635
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10334 if ((dp->d_name[0] != '.' || starts_with_dot |
|
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10335 || ((flags & EW_DODOT) |
|
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10336 && dp->d_name[1] != NUL |
|
1506f86b120f
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Christian Brabandt <cb@256bit.org>
parents:
7633
diff
changeset
|
10337 && (dp->d_name[1] != '.' || dp->d_name[2] != NUL))) |
| 3261 | 10338 && ((regmatch.regprog != NULL && vim_regexec(®match, |
| 10339 (char_u *)dp->d_name, (colnr_T)0)) | |
| 2984 | 10340 || ((flags & EW_NOTWILD) |
| 10341 && fnamencmp(path + (s - buf), dp->d_name, e - s) == 0))) | |
| 445 | 10342 { |
| 10343 STRCPY(s, dp->d_name); | |
| 10344 len = STRLEN(buf); | |
| 10345 | |
| 10346 if (starstar && stardepth < 100) | |
| 10347 { | |
| 10348 /* For "**" in the pattern first go deeper in the tree to | |
| 10349 * find matches. */ | |
| 10350 STRCPY(buf + len, "/**"); | |
| 10351 STRCPY(buf + len + 3, path_end); | |
| 10352 ++stardepth; | |
| 10353 (void)unix_expandpath(gap, buf, len + 1, flags, TRUE); | |
| 10354 --stardepth; | |
| 10355 } | |
| 10356 | |
| 10357 STRCPY(buf + len, path_end); | |
| 10358 if (mch_has_exp_wildcard(path_end)) /* handle more wildcards */ | |
| 10359 { | |
| 10360 /* need to expand another component of the path */ | |
| 10361 /* remove backslashes for the remaining components only */ | |
| 10362 (void)unix_expandpath(gap, buf, len + 1, flags, FALSE); | |
| 10363 } | |
| 10364 else | |
| 10365 { | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
10366 stat_T sb; |
| 6663 | 10367 |
| 445 | 10368 /* no more wildcards, check if there is a match */ |
| 10369 /* remove backslashes for the remaining components only */ | |
| 10370 if (*path_end != NUL) | |
| 10371 backslash_halve(buf + len + 1); | |
| 6663 | 10372 /* add existing file or symbolic link */ |
| 6665 | 10373 if ((flags & EW_ALLLINKS) ? mch_lstat((char *)buf, &sb) >= 0 |
| 6663 | 10374 : mch_getperm(buf) >= 0) |
| 445 | 10375 { |
| 768 | 10376 #ifdef MACOS_CONVERT |
| 445 | 10377 size_t precomp_len = STRLEN(buf)+1; |
| 10378 char_u *precomp_buf = | |
| 10379 mac_precompose_path(buf, precomp_len, &precomp_len); | |
| 768 | 10380 |
| 445 | 10381 if (precomp_buf) |
| 10382 { | |
| 10383 mch_memmove(buf, precomp_buf, precomp_len); | |
| 10384 vim_free(precomp_buf); | |
| 10385 } | |
| 10386 #endif | |
| 10387 addfile(gap, buf, flags); | |
| 10388 } | |
| 10389 } | |
| 10390 } | |
| 10391 } | |
| 10392 | |
| 10393 closedir(dirp); | |
| 10394 } | |
| 10395 | |
| 10396 vim_free(buf); | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4752
diff
changeset
|
10397 vim_regfree(regmatch.regprog); |
| 445 | 10398 |
| 10399 matches = gap->ga_len - start_len; | |
| 10400 if (matches > 0) | |
| 10401 qsort(((char_u **)gap->ga_data) + start_len, matches, | |
| 10402 sizeof(char_u *), pstrcmp); | |
| 10403 return matches; | |
| 10404 } | |
| 10405 #endif | |
| 10406 | |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10407 #if defined(FEAT_SEARCHPATH) |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10408 static int find_previous_pathsep(char_u *path, char_u **psep); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10409 static int is_unique(char_u *maybe_unique, garray_T *gap, int i); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10410 static void expand_path_option(char_u *curdir, garray_T *gap); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10411 static char_u *get_path_cutoff(char_u *fname, garray_T *gap); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10412 static void uniquefy_paths(garray_T *gap, char_u *pattern); |
|
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10413 static int expand_in_path(garray_T *gap, char_u *pattern, int flags); |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10414 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10415 /* |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10416 * Moves "*psep" back to the previous path separator in "path". |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10417 * Returns FAIL is "*psep" ends up at the beginning of "path". |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10418 */ |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10419 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10420 find_previous_pathsep(char_u *path, char_u **psep) |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10421 { |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10422 /* skip the current separator */ |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10423 if (*psep > path && vim_ispathsep(**psep)) |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10424 --*psep; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10425 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10426 /* find the previous separator */ |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10427 while (*psep > path) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10428 { |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10429 if (vim_ispathsep(**psep)) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10430 return OK; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10431 MB_PTR_BACK(path, *psep); |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10432 } |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10433 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10434 return FAIL; |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10435 } |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10436 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10437 /* |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10438 * Returns TRUE if "maybe_unique" is unique wrt other_paths in "gap". |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10439 * "maybe_unique" is the end portion of "((char_u **)gap->ga_data)[i]". |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10440 */ |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10441 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10442 is_unique(char_u *maybe_unique, garray_T *gap, int i) |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10443 { |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10444 int j; |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10445 int candidate_len; |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10446 int other_path_len; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10447 char_u **other_paths = (char_u **)gap->ga_data; |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10448 char_u *rival; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10449 |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10450 for (j = 0; j < gap->ga_len; j++) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10451 { |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10452 if (j == i) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10453 continue; /* don't compare it with itself */ |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10454 |
|
2322
70be008dff4f
Avoid compiler warnings for size_t to int conversions.
Bram Moolenaar <bram@vim.org>
parents:
2313
diff
changeset
|
10455 candidate_len = (int)STRLEN(maybe_unique); |
|
70be008dff4f
Avoid compiler warnings for size_t to int conversions.
Bram Moolenaar <bram@vim.org>
parents:
2313
diff
changeset
|
10456 other_path_len = (int)STRLEN(other_paths[j]); |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10457 if (other_path_len < candidate_len) |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10458 continue; /* it's different when it's shorter */ |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10459 |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10460 rival = other_paths[j] + other_path_len - candidate_len; |
| 2574 | 10461 if (fnamecmp(maybe_unique, rival) == 0 |
| 10462 && (rival == other_paths[j] || vim_ispathsep(*(rival - 1)))) | |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10463 return FALSE; /* match */ |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10464 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10465 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10466 return TRUE; /* no match found */ |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10467 } |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10468 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10469 /* |
|
2460
b8eb7c0f74c2
Remove unused variable and STRLEN(). (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2435
diff
changeset
|
10470 * Split the 'path' option into an array of strings in garray_T. Relative |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10471 * paths are expanded to their equivalent fullpath. This includes the "." |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10472 * (relative to current buffer directory) and empty path (relative to current |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10473 * directory) notations. |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10474 * |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10475 * TODO: handle upward search (;) and path limiter (**N) notations by |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10476 * expanding each into their equivalent path(s). |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10477 */ |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10478 static void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10479 expand_path_option(char_u *curdir, garray_T *gap) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10480 { |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10481 char_u *path_option = *curbuf->b_p_path == NUL |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10482 ? p_path : curbuf->b_p_path; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10483 char_u *buf; |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10484 char_u *p; |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10485 int len; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10486 |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
10487 if ((buf = alloc((int)MAXPATHL)) == NULL) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10488 return; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10489 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10490 while (*path_option != NUL) |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10491 { |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10492 copy_option_part(&path_option, buf, MAXPATHL, " ,"); |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10493 |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10494 if (buf[0] == '.' && (buf[1] == NUL || vim_ispathsep(buf[1]))) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10495 { |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10496 /* Relative to current buffer: |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10497 * "/path/file" + "." -> "/path/" |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10498 * "/path/file" + "./subdir" -> "/path/subdir" */ |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10499 if (curbuf->b_ffname == NULL) |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10500 continue; |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10501 p = gettail(curbuf->b_ffname); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10502 len = (int)(p - curbuf->b_ffname); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10503 if (len + (int)STRLEN(buf) >= MAXPATHL) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10504 continue; |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10505 if (buf[1] == NUL) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10506 buf[len] = NUL; |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10507 else |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10508 STRMOVE(buf + len, buf + 2); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10509 mch_memmove(buf, curbuf->b_ffname, len); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10510 simplify_filename(buf); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10511 } |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10512 else if (buf[0] == NUL) |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10513 /* relative to current directory */ |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10514 STRCPY(buf, curdir); |
|
2495
a847363bf06e
Fix a few problems for :find completion. Test much more. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2487
diff
changeset
|
10515 else if (path_with_url(buf)) |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10516 /* URL can't be used here */ |
|
2495
a847363bf06e
Fix a few problems for :find completion. Test much more. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2487
diff
changeset
|
10517 continue; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10518 else if (!mch_isFullName(buf)) |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10519 { |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10520 /* Expand relative path to their full path equivalent */ |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10521 len = (int)STRLEN(curdir); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10522 if (len + (int)STRLEN(buf) + 3 > MAXPATHL) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10523 continue; |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10524 STRMOVE(buf + len + 1, buf); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10525 STRCPY(buf, curdir); |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10526 buf[len] = PATHSEP; |
|
2476
6be86488996b
Fix: With 'path' set to relative directory ":find" completion didn't work.
Bram Moolenaar <bram@vim.org>
parents:
2471
diff
changeset
|
10527 simplify_filename(buf); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10528 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10529 |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10530 if (ga_grow(gap, 1) == FAIL) |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10531 break; |
| 4335 | 10532 |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
10533 # if defined(MSWIN) |
| 4335 | 10534 /* Avoid the path ending in a backslash, it fails when a comma is |
| 10535 * appended. */ | |
| 4342 | 10536 len = (int)STRLEN(buf); |
| 4335 | 10537 if (buf[len - 1] == '\\') |
| 10538 buf[len - 1] = '/'; | |
| 10539 # endif | |
| 10540 | |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10541 p = vim_strsave(buf); |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10542 if (p == NULL) |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10543 break; |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10544 ((char_u **)gap->ga_data)[gap->ga_len++] = p; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10545 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10546 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10547 vim_free(buf); |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10548 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10549 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10550 /* |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10551 * Returns a pointer to the file or directory name in "fname" that matches the |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10552 * longest path in "ga"p, or NULL if there is no match. For example: |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10553 * |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10554 * path: /foo/bar/baz |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10555 * fname: /foo/bar/baz/quux.txt |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10556 * returns: ^this |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10557 */ |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10558 static char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10559 get_path_cutoff(char_u *fname, garray_T *gap) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10560 { |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10561 int i; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10562 int maxlen = 0; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10563 char_u **path_part = (char_u **)gap->ga_data; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10564 char_u *cutoff = NULL; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10565 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10566 for (i = 0; i < gap->ga_len; i++) |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10567 { |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10568 int j = 0; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10569 |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10570 while ((fname[j] == path_part[i][j] |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
10571 # if defined(MSWIN) |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10572 || (vim_ispathsep(fname[j]) && vim_ispathsep(path_part[i][j])) |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10573 #endif |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10574 ) && fname[j] != NUL && path_part[i][j] != NUL) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10575 j++; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10576 if (j > maxlen) |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10577 { |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10578 maxlen = j; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10579 cutoff = &fname[j]; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10580 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10581 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10582 |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10583 /* skip to the file or directory name */ |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10584 if (cutoff != NULL) |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10585 while (vim_ispathsep(*cutoff)) |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10586 MB_PTR_ADV(cutoff); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10587 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10588 return cutoff; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10589 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10590 |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10591 /* |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10592 * Sorts, removes duplicates and modifies all the fullpath names in "gap" so |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10593 * that they are unique with respect to each other while conserving the part |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10594 * that matches the pattern. Beware, this is at least O(n^2) wrt "gap->ga_len". |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10595 */ |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10596 static void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10597 uniquefy_paths(garray_T *gap, char_u *pattern) |
|
2361
e12685c50982
Fix some duplicates in ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2354
diff
changeset
|
10598 { |
|
e12685c50982
Fix some duplicates in ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2354
diff
changeset
|
10599 int i; |
|
e12685c50982
Fix some duplicates in ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2354
diff
changeset
|
10600 int len; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10601 char_u **fnames = (char_u **)gap->ga_data; |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10602 int sort_again = FALSE; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10603 char_u *pat; |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10604 char_u *file_pattern; |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10605 char_u *curdir; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10606 regmatch_T regmatch; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10607 garray_T path_ga; |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10608 char_u **in_curdir = NULL; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10609 char_u *short_name; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10610 |
|
2361
e12685c50982
Fix some duplicates in ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2354
diff
changeset
|
10611 remove_duplicates(gap); |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10612 ga_init2(&path_ga, (int)sizeof(char_u *), 1); |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10613 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10614 /* |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10615 * We need to prepend a '*' at the beginning of file_pattern so that the |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10616 * regex matches anywhere in the path. FIXME: is this valid for all |
|
2387
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10617 * possible patterns? |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10618 */ |
|
2322
70be008dff4f
Avoid compiler warnings for size_t to int conversions.
Bram Moolenaar <bram@vim.org>
parents:
2313
diff
changeset
|
10619 len = (int)STRLEN(pattern); |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10620 file_pattern = alloc(len + 2); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10621 if (file_pattern == NULL) |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10622 return; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10623 file_pattern[0] = '*'; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10624 file_pattern[1] = NUL; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10625 STRCAT(file_pattern, pattern); |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10626 pat = file_pat_to_reg_pat(file_pattern, NULL, NULL, TRUE); |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10627 vim_free(file_pattern); |
|
2387
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10628 if (pat == NULL) |
|
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10629 return; |
|
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10630 |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10631 regmatch.rm_ic = TRUE; /* always ignore case */ |
|
2387
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10632 regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING); |
|
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10633 vim_free(pat); |
|
797f7b467b03
Fix memory leak in :find completion. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2361
diff
changeset
|
10634 if (regmatch.regprog == NULL) |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10635 return; |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10636 |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10637 if ((curdir = alloc((int)(MAXPATHL))) == NULL) |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10638 goto theend; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10639 mch_dirname(curdir, MAXPATHL); |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10640 expand_path_option(curdir, &path_ga); |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10641 |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10642 in_curdir = (char_u **)alloc_clear(gap->ga_len * sizeof(char_u *)); |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10643 if (in_curdir == NULL) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10644 goto theend; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10645 |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10646 for (i = 0; i < gap->ga_len && !got_int; i++) |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10647 { |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10648 char_u *path = fnames[i]; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10649 int is_in_curdir; |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10650 char_u *dir_end = gettail_dir(path); |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10651 char_u *pathsep_p; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10652 char_u *path_cutoff; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10653 |
|
2322
70be008dff4f
Avoid compiler warnings for size_t to int conversions.
Bram Moolenaar <bram@vim.org>
parents:
2313
diff
changeset
|
10654 len = (int)STRLEN(path); |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10655 is_in_curdir = fnamencmp(curdir, path, dir_end - path) == 0 |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10656 && curdir[dir_end - path] == NUL; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10657 if (is_in_curdir) |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10658 in_curdir[i] = vim_strsave(path); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10659 |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10660 /* Shorten the filename while maintaining its uniqueness */ |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10661 path_cutoff = get_path_cutoff(path, &path_ga); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10662 |
|
10002
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10663 /* Don't assume all files can be reached without path when search |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10664 * pattern starts with star star slash, so only remove path_cutoff |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10665 * when possible. */ |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10666 if (pattern[0] == '*' && pattern[1] == '*' |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10667 && vim_ispathsep_nocolon(pattern[2]) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10668 && path_cutoff != NULL |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10669 && vim_regexec(®match, path_cutoff, (colnr_T)0) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10670 && is_unique(path_cutoff, gap, i)) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10671 { |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10672 sort_again = TRUE; |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10673 mch_memmove(path, path_cutoff, STRLEN(path_cutoff) + 1); |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10674 } |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10675 else |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10676 { |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10677 /* Here all files can be reached without path, so get shortest |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10678 * unique path. We start at the end of the path. */ |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10679 pathsep_p = path + len - 1; |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10680 |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10681 while (find_previous_pathsep(path, &pathsep_p)) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10682 if (vim_regexec(®match, pathsep_p + 1, (colnr_T)0) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10683 && is_unique(pathsep_p + 1, gap, i) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10684 && path_cutoff != NULL && pathsep_p + 1 >= path_cutoff) |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10685 { |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10686 sort_again = TRUE; |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10687 mch_memmove(path, pathsep_p + 1, STRLEN(pathsep_p)); |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10688 break; |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10689 } |
|
ff0b4216f026
commit https://github.com/vim/vim/commit/73d4e4c8922f6f4d256f910a18f47c0c3a48c28b
Christian Brabandt <cb@256bit.org>
parents:
9896
diff
changeset
|
10690 } |
| 2538 | 10691 |
| 10692 if (mch_isFullName(path)) | |
| 10693 { | |
| 10694 /* | |
| 10695 * Last resort: shorten relative to curdir if possible. | |
| 10696 * 'possible' means: | |
| 10697 * 1. It is under the current directory. | |
| 10698 * 2. The result is actually shorter than the original. | |
| 10699 * | |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10700 * Before curdir After |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10701 * /foo/bar/file.txt /foo/bar ./file.txt |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10702 * c:\foo\bar\file.txt c:\foo\bar .\file.txt |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10703 * /file.txt / /file.txt |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10704 * c:\file.txt c:\ .\file.txt |
| 2538 | 10705 */ |
| 10706 short_name = shorten_fname(path, curdir); | |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10707 if (short_name != NULL && short_name > path + 1 |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
10708 #if defined(MSWIN) |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10709 /* On windows, |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10710 * shorten_fname("c:\a\a.txt", "c:\a\b") |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10711 * returns "\a\a.txt", which is not really the short |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10712 * name, hence: */ |
|
2549
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10713 && !vim_ispathsep(*short_name) |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10714 #endif |
|
c210e31a2ec5
More fixes for :find completion. (mostly by Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2542
diff
changeset
|
10715 ) |
| 2538 | 10716 { |
| 10717 STRCPY(path, "."); | |
| 10718 add_pathsep(path); | |
|
2562
19f4f5ee3d1f
Fix: strcat() on overlapping string. (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2559
diff
changeset
|
10719 STRMOVE(path + STRLEN(path), short_name); |
| 2538 | 10720 } |
| 10721 } | |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10722 ui_breakcheck(); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10723 } |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10724 |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10725 /* Shorten filenames in /in/current/directory/{filename} */ |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10726 for (i = 0; i < gap->ga_len && !got_int; i++) |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10727 { |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10728 char_u *rel_path; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10729 char_u *path = in_curdir[i]; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10730 |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10731 if (path == NULL) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10732 continue; |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10733 |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10734 /* If the {filename} is not unique, change it to ./{filename}. |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10735 * Else reduce it to {filename} */ |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10736 short_name = shorten_fname(path, curdir); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10737 if (short_name == NULL) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10738 short_name = path; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10739 if (is_unique(short_name, gap, i)) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10740 { |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10741 STRCPY(fnames[i], short_name); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10742 continue; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10743 } |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10744 |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10745 rel_path = alloc((int)(STRLEN(short_name) + STRLEN(PATHSEPSTR) + 2)); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10746 if (rel_path == NULL) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10747 goto theend; |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10748 STRCPY(rel_path, "."); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10749 add_pathsep(rel_path); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10750 STRCAT(rel_path, short_name); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10751 |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10752 vim_free(fnames[i]); |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10753 fnames[i] = rel_path; |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10754 sort_again = TRUE; |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10755 ui_breakcheck(); |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10756 } |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10757 |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10758 theend: |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10759 vim_free(curdir); |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10760 if (in_curdir != NULL) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10761 { |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10762 for (i = 0; i < gap->ga_len; i++) |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10763 vim_free(in_curdir[i]); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10764 vim_free(in_curdir); |
|
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10765 } |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10766 ga_clear_strings(&path_ga); |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4752
diff
changeset
|
10767 vim_regfree(regmatch.regprog); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10768 |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10769 if (sort_again) |
|
2361
e12685c50982
Fix some duplicates in ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2354
diff
changeset
|
10770 remove_duplicates(gap); |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10771 } |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10772 |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10773 /* |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
10774 * Calls globpath() with 'path' values for the given pattern and stores the |
|
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
10775 * result in "gap". |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10776 * Returns the total number of matches. |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10777 */ |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10778 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10779 expand_in_path( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10780 garray_T *gap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10781 char_u *pattern, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10782 int flags) /* EW_* flags */ |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10783 { |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10784 char_u *curdir; |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10785 garray_T path_ga; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10786 char_u *paths = NULL; |
|
13180
0dfd846f9190
patch 8.0.1464: completing directory after :find does not add slash
Christian Brabandt <cb@256bit.org>
parents:
13082
diff
changeset
|
10787 int glob_flags = 0; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10788 |
|
2477
81bf2aaa979a
Fix crash in :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2476
diff
changeset
|
10789 if ((curdir = alloc((unsigned)MAXPATHL)) == NULL) |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10790 return 0; |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10791 mch_dirname(curdir, MAXPATHL); |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10792 |
|
2542
7a547db7070d
Improvements for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2538
diff
changeset
|
10793 ga_init2(&path_ga, (int)sizeof(char_u *), 1); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10794 expand_path_option(curdir, &path_ga); |
|
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10795 vim_free(curdir); |
|
2481
734196b073e0
Fix crash when no item in 'path' is used for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2477
diff
changeset
|
10796 if (path_ga.ga_len == 0) |
|
734196b073e0
Fix crash when no item in 'path' is used for :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2477
diff
changeset
|
10797 return 0; |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
10798 |
| 5873 | 10799 paths = ga_concat_strings(&path_ga, ","); |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
10800 ga_clear_strings(&path_ga); |
|
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
10801 if (paths == NULL) |
|
2477
81bf2aaa979a
Fix crash in :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2476
diff
changeset
|
10802 return 0; |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10803 |
|
13180
0dfd846f9190
patch 8.0.1464: completing directory after :find does not add slash
Christian Brabandt <cb@256bit.org>
parents:
13082
diff
changeset
|
10804 if (flags & EW_ICASE) |
|
0dfd846f9190
patch 8.0.1464: completing directory after :find does not add slash
Christian Brabandt <cb@256bit.org>
parents:
13082
diff
changeset
|
10805 glob_flags |= WILD_ICASE; |
|
0dfd846f9190
patch 8.0.1464: completing directory after :find does not add slash
Christian Brabandt <cb@256bit.org>
parents:
13082
diff
changeset
|
10806 if (flags & EW_ADDSLASH) |
|
0dfd846f9190
patch 8.0.1464: completing directory after :find does not add slash
Christian Brabandt <cb@256bit.org>
parents:
13082
diff
changeset
|
10807 glob_flags |= WILD_ADD_SLASH; |
|
0dfd846f9190
patch 8.0.1464: completing directory after :find does not add slash
Christian Brabandt <cb@256bit.org>
parents:
13082
diff
changeset
|
10808 globpath(paths, pattern, gap, glob_flags); |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
10809 vim_free(paths); |
|
2471
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10810 |
|
6570c136be32
Improvements for :find completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2460
diff
changeset
|
10811 return gap->ga_len; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10812 } |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10813 #endif |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
10814 |
|
2433
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10815 #if defined(FEAT_SEARCHPATH) || defined(FEAT_CMDL_COMPL) || defined(PROTO) |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10816 /* |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10817 * Sort "gap" and remove duplicate entries. "gap" is expected to contain a |
|
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10818 * list of file names in allocated memory. |
|
2433
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10819 */ |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10820 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10821 remove_duplicates(garray_T *gap) |
|
2433
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10822 { |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10823 int i; |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10824 int j; |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10825 char_u **fnames = (char_u **)gap->ga_data; |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10826 |
|
2559
7850c8c12347
Cleanup in :find completion code. Make it work for "./subdir" in 'path'.
Bram Moolenaar <bram@vim.org>
parents:
2549
diff
changeset
|
10827 sort_strings(fnames, gap->ga_len); |
|
2433
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10828 for (i = gap->ga_len - 1; i > 0; --i) |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10829 if (fnamecmp(fnames[i - 1], fnames[i]) == 0) |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10830 { |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10831 vim_free(fnames[i]); |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10832 for (j = i + 1; j < gap->ga_len; ++j) |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10833 fnames[j - 1] = fnames[j]; |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10834 --gap->ga_len; |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10835 } |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10836 } |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10837 #endif |
|
98b9a6b9e7d5
Add completion for ":ownsyntax" and improve completion for ":filetype".
Bram Moolenaar <bram@vim.org>
parents:
2429
diff
changeset
|
10838 |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10839 static int has_env_var(char_u *p); |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10840 |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10841 /* |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10842 * Return TRUE if "p" contains what looks like an environment variable. |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10843 * Allowing for escaping. |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10844 */ |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10845 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10846 has_env_var(char_u *p) |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10847 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10848 for ( ; *p; MB_PTR_ADV(p)) |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10849 { |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10850 if (*p == '\\' && p[1] != NUL) |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10851 ++p; |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10852 else if (vim_strchr((char_u *) |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
8163
diff
changeset
|
10853 #if defined(MSWIN) |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10854 "$%" |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10855 #else |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10856 "$" |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10857 #endif |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10858 , *p) != NULL) |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10859 return TRUE; |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10860 } |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10861 return FALSE; |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10862 } |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10863 |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10864 #ifdef SPECIAL_WILDCHAR |
|
7803
37c929c4a073
commit https://github.com/vim/vim/commit/92b8b2d307e34117f146319872010b0ccc9d2713
Christian Brabandt <cb@256bit.org>
parents:
7641
diff
changeset
|
10865 static int has_special_wildchar(char_u *p); |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10866 |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10867 /* |
|
10932
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
10868 * Return TRUE if "p" contains a special wildcard character, one that Vim |
|
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
10869 * cannot expand, requires using a shell. |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10870 */ |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10871 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10872 has_special_wildchar(char_u *p) |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10873 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10874 for ( ; *p; MB_PTR_ADV(p)) |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10875 { |
|
10932
141fe140976c
patch 8.0.0355: using uninitialized memory when 'isfname' is empty
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
10876 /* Allow for escaping. */ |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10877 if (*p == '\\' && p[1] != NUL) |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10878 ++p; |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10879 else if (vim_strchr((char_u *)SPECIAL_WILDCHAR, *p) != NULL) |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10880 return TRUE; |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10881 } |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10882 return FALSE; |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10883 } |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10884 #endif |
|
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10885 |
| 7 | 10886 /* |
| 10887 * Generic wildcard expansion code. | |
| 10888 * | |
| 10889 * Characters in "pat" that should not be expanded must be preceded with a | |
| 10890 * backslash. E.g., "/path\ with\ spaces/my\*star*" | |
| 10891 * | |
| 10892 * Return FAIL when no single file was found. In this case "num_file" is not | |
| 10893 * set, and "file" may contain an error message. | |
| 10894 * Return OK when some files found. "num_file" is set to the number of | |
| 10895 * matches, "file" to the array of matches. Call FreeWild() later. | |
| 10896 */ | |
| 10897 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10898 gen_expand_wildcards( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10899 int num_pat, /* number of input patterns */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10900 char_u **pat, /* array of input patterns */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10901 int *num_file, /* resulting number of files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10902 char_u ***file, /* array of resulting files */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
10903 int flags) /* EW_* flags */ |
| 7 | 10904 { |
| 10905 int i; | |
| 10906 garray_T ga; | |
| 10907 char_u *p; | |
| 10908 static int recursive = FALSE; | |
| 10909 int add_pat; | |
|
7036
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
10910 int retval = OK; |
|
2568
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
10911 #if defined(FEAT_SEARCHPATH) |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
10912 int did_expand_in_path = FALSE; |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
10913 #endif |
| 7 | 10914 |
| 10915 /* | |
| 10916 * expand_env() is called to expand things like "~user". If this fails, | |
| 10917 * it calls ExpandOne(), which brings us back here. In this case, always | |
| 10918 * call the machine specific expansion function, if possible. Otherwise, | |
| 10919 * return FAIL. | |
| 10920 */ | |
| 10921 if (recursive) | |
| 10922 #ifdef SPECIAL_WILDCHAR | |
| 10923 return mch_expand_wildcards(num_pat, pat, num_file, file, flags); | |
| 10924 #else | |
| 10925 return FAIL; | |
| 10926 #endif | |
| 10927 | |
| 10928 #ifdef SPECIAL_WILDCHAR | |
| 10929 /* | |
| 10930 * If there are any special wildcard characters which we cannot handle | |
| 10931 * here, call machine specific function for all the expansion. This | |
| 10932 * avoids starting the shell for each argument separately. | |
| 10933 * For `=expr` do use the internal function. | |
| 10934 */ | |
| 10935 for (i = 0; i < num_pat; i++) | |
| 10936 { | |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10937 if (has_special_wildchar(pat[i]) |
| 7 | 10938 # ifdef VIM_BACKTICK |
| 10939 && !(vim_backtick(pat[i]) && pat[i][1] == '=') | |
| 10940 # endif | |
| 10941 ) | |
| 10942 return mch_expand_wildcards(num_pat, pat, num_file, file, flags); | |
| 10943 } | |
| 10944 #endif | |
| 10945 | |
| 10946 recursive = TRUE; | |
| 10947 | |
| 10948 /* | |
| 10949 * The matching file names are stored in a growarray. Init it empty. | |
| 10950 */ | |
| 10951 ga_init2(&ga, (int)sizeof(char_u *), 30); | |
| 10952 | |
| 10953 for (i = 0; i < num_pat; ++i) | |
| 10954 { | |
| 10955 add_pat = -1; | |
| 10956 p = pat[i]; | |
| 10957 | |
| 10958 #ifdef VIM_BACKTICK | |
| 10959 if (vim_backtick(p)) | |
|
7036
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
10960 { |
| 7 | 10961 add_pat = expand_backtick(&ga, p, flags); |
|
7036
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
10962 if (add_pat == -1) |
|
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
10963 retval = FAIL; |
|
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
10964 } |
| 7 | 10965 else |
| 10966 #endif | |
| 10967 { | |
| 10968 /* | |
| 10969 * First expand environment variables, "~/" and "~user/". | |
| 10970 */ | |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10971 if (has_env_var(p) || *p == '~') |
| 7 | 10972 { |
| 1408 | 10973 p = expand_env_save_opt(p, TRUE); |
| 7 | 10974 if (p == NULL) |
| 10975 p = pat[i]; | |
| 10976 #ifdef UNIX | |
| 10977 /* | |
| 10978 * On Unix, if expand_env() can't expand an environment | |
| 10979 * variable, use the shell to do that. Discard previously | |
| 10980 * found file names and start all over again. | |
| 10981 */ | |
|
5104
93cccad6a26b
updated for version 7.3.1295
Bram Moolenaar <bram@vim.org>
parents:
4940
diff
changeset
|
10982 else if (has_env_var(p) || *p == '~') |
| 7 | 10983 { |
| 10984 vim_free(p); | |
| 1914 | 10985 ga_clear_strings(&ga); |
| 7 | 10986 i = mch_expand_wildcards(num_pat, pat, num_file, file, |
| 6174 | 10987 flags|EW_KEEPDOLLAR); |
| 7 | 10988 recursive = FALSE; |
| 10989 return i; | |
| 10990 } | |
| 10991 #endif | |
| 10992 } | |
| 10993 | |
| 10994 /* | |
| 10995 * If there are wildcards: Expand file names and add each match to | |
| 10996 * the list. If there is no match, and EW_NOTFOUND is given, add | |
| 10997 * the pattern. | |
| 10998 * If there are no wildcards: Add the file name if it exists or | |
| 10999 * when EW_NOTFOUND is given. | |
| 11000 */ | |
| 11001 if (mch_has_exp_wildcard(p)) | |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11002 { |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11003 #if defined(FEAT_SEARCHPATH) |
|
2568
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11004 if ((flags & EW_PATH) |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11005 && !mch_isFullName(p) |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11006 && !(p[0] == '.' |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11007 && (vim_ispathsep(p[1]) |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11008 || (p[1] == '.' && vim_ispathsep(p[2])))) |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11009 ) |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
11010 { |
|
2568
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11011 /* :find completion where 'path' is used. |
|
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11012 * Recursiveness is OK here. */ |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
11013 recursive = FALSE; |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11014 add_pat = expand_in_path(&ga, p, flags); |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
11015 recursive = TRUE; |
|
2568
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11016 did_expand_in_path = TRUE; |
|
2487
7ec9ada2cd81
Make :find completion consistent between Unix and MS-Windows. Add a test.
Bram Moolenaar <bram@vim.org>
parents:
2481
diff
changeset
|
11017 } |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11018 else |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11019 #endif |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11020 add_pat = mch_expandpath(&ga, p, flags); |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
11021 } |
| 7 | 11022 } |
| 11023 | |
| 11024 if (add_pat == -1 || (add_pat == 0 && (flags & EW_NOTFOUND))) | |
| 11025 { | |
| 11026 char_u *t = backslash_halve_save(p); | |
| 11027 | |
| 11028 /* When EW_NOTFOUND is used, always add files and dirs. Makes | |
| 11029 * "vim c:/" work. */ | |
| 11030 if (flags & EW_NOTFOUND) | |
| 11031 addfile(&ga, t, flags | EW_DIR | EW_FILE); | |
|
9420
9f78f3f0c81f
commit https://github.com/vim/vim/commit/00efded1064427ab3f84e4d57af62e0aab876fc6
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
11032 else |
| 7 | 11033 addfile(&ga, t, flags); |
| 11034 vim_free(t); | |
| 11035 } | |
| 11036 | |
|
2313
e382b66b936d
Fix using freed memory in :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
11037 #if defined(FEAT_SEARCHPATH) |
|
2568
1ead15c2ffd0
Two fixes for :find completion and more testing. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2562
diff
changeset
|
11038 if (did_expand_in_path && ga.ga_len > 0 && (flags & EW_PATH)) |
|
2313
e382b66b936d
Fix using freed memory in :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
11039 uniquefy_paths(&ga, p); |
|
e382b66b936d
Fix using freed memory in :find completion.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
11040 #endif |
| 7 | 11041 if (p != pat[i]) |
| 11042 vim_free(p); | |
| 11043 } | |
| 11044 | |
| 11045 *num_file = ga.ga_len; | |
| 11046 *file = (ga.ga_data != NULL) ? (char_u **)ga.ga_data : (char_u **)""; | |
| 11047 | |
| 11048 recursive = FALSE; | |
| 11049 | |
|
7641
b44fc33ef92a
commit https://github.com/vim/vim/commit/336bd622c31e1805495c034e1a8cfadcc0bbabc7
Christian Brabandt <cb@256bit.org>
parents:
7635
diff
changeset
|
11050 return ((flags & EW_EMPTYOK) || ga.ga_data != NULL) ? retval : FAIL; |
| 7 | 11051 } |
| 11052 | |
| 11053 # ifdef VIM_BACKTICK | |
| 11054 | |
| 11055 /* | |
| 11056 * Return TRUE if we can expand this backtick thing here. | |
| 11057 */ | |
| 11058 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11059 vim_backtick(char_u *p) |
| 7 | 11060 { |
| 11061 return (*p == '`' && *(p + 1) != NUL && *(p + STRLEN(p) - 1) == '`'); | |
| 11062 } | |
| 11063 | |
| 11064 /* | |
| 11065 * Expand an item in `backticks` by executing it as a command. | |
| 11066 * Currently only works when pat[] starts and ends with a `. | |
|
7036
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
11067 * Returns number of file names found, -1 if an error is encountered. |
| 7 | 11068 */ |
| 11069 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11070 expand_backtick( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11071 garray_T *gap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11072 char_u *pat, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11073 int flags) /* EW_* flags */ |
| 7 | 11074 { |
| 11075 char_u *p; | |
| 11076 char_u *cmd; | |
| 11077 char_u *buffer; | |
| 11078 int cnt = 0; | |
| 11079 int i; | |
| 11080 | |
| 11081 /* Create the command: lop off the backticks. */ | |
| 11082 cmd = vim_strnsave(pat + 1, (int)STRLEN(pat) - 2); | |
| 11083 if (cmd == NULL) | |
|
7036
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
11084 return -1; |
| 7 | 11085 |
| 11086 #ifdef FEAT_EVAL | |
| 11087 if (*cmd == '=') /* `={expr}`: Expand expression */ | |
| 714 | 11088 buffer = eval_to_string(cmd + 1, &p, TRUE); |
| 7 | 11089 else |
| 11090 #endif | |
| 24 | 11091 buffer = get_cmd_output(cmd, NULL, |
| 5808 | 11092 (flags & EW_SILENT) ? SHELL_SILENT : 0, NULL); |
| 7 | 11093 vim_free(cmd); |
| 11094 if (buffer == NULL) | |
|
7036
5f00b8d7148f
commit https://github.com/vim/vim/commit/3f188935ec4db5117c4a64cc3f71219175624745
Christian Brabandt <cb@256bit.org>
parents:
6971
diff
changeset
|
11095 return -1; |
| 7 | 11096 |
| 11097 cmd = buffer; | |
| 11098 while (*cmd != NUL) | |
| 11099 { | |
| 11100 cmd = skipwhite(cmd); /* skip over white space */ | |
| 11101 p = cmd; | |
| 11102 while (*p != NUL && *p != '\r' && *p != '\n') /* skip over entry */ | |
| 11103 ++p; | |
| 11104 /* add an entry if it is not empty */ | |
| 11105 if (p > cmd) | |
| 11106 { | |
| 11107 i = *p; | |
| 11108 *p = NUL; | |
| 11109 addfile(gap, cmd, flags); | |
| 11110 *p = i; | |
| 11111 ++cnt; | |
| 11112 } | |
| 11113 cmd = p; | |
| 11114 while (*cmd != NUL && (*cmd == '\r' || *cmd == '\n')) | |
| 11115 ++cmd; | |
| 11116 } | |
| 11117 | |
| 11118 vim_free(buffer); | |
| 11119 return cnt; | |
| 11120 } | |
| 11121 # endif /* VIM_BACKTICK */ | |
| 11122 | |
| 11123 /* | |
| 11124 * Add a file to a file list. Accepted flags: | |
| 11125 * EW_DIR add directories | |
| 11126 * EW_FILE add files | |
| 716 | 11127 * EW_EXEC add executable files |
| 7 | 11128 * EW_NOTFOUND add even when it doesn't exist |
| 11129 * EW_ADDSLASH add slash after directory name | |
| 6663 | 11130 * EW_ALLLINKS add symlink also when the referred file does not exist |
| 7 | 11131 */ |
| 11132 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11133 addfile( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11134 garray_T *gap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11135 char_u *f, /* filename */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11136 int flags) |
| 7 | 11137 { |
| 11138 char_u *p; | |
| 11139 int isdir; | |
|
9387
f094d4085014
commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
11140 stat_T sb; |
| 6663 | 11141 |
| 11142 /* if the file/dir/link doesn't exist, may not add it */ | |
| 11143 if (!(flags & EW_NOTFOUND) && ((flags & EW_ALLLINKS) | |
| 6665 | 11144 ? mch_lstat((char *)f, &sb) < 0 : mch_getperm(f) < 0)) |
| 7 | 11145 return; |
| 11146 | |
| 11147 #ifdef FNAME_ILLEGAL | |
| 11148 /* if the file/dir contains illegal characters, don't add it */ | |
| 11149 if (vim_strpbrk(f, (char_u *)FNAME_ILLEGAL) != NULL) | |
| 11150 return; | |
| 11151 #endif | |
| 11152 | |
| 11153 isdir = mch_isdir(f); | |
| 11154 if ((isdir && !(flags & EW_DIR)) || (!isdir && !(flags & EW_FILE))) | |
| 11155 return; | |
| 11156 | |
| 6695 | 11157 /* If the file isn't executable, may not add it. Do accept directories. |
| 11158 * When invoked from expand_shellcmd() do not use $PATH. */ | |
| 11159 if (!isdir && (flags & EW_EXEC) | |
| 11160 && !mch_can_exe(f, NULL, !(flags & EW_SHELLCMD))) | |
| 716 | 11161 return; |
| 11162 | |
| 7 | 11163 /* Make room for another item in the file list. */ |
| 11164 if (ga_grow(gap, 1) == FAIL) | |
| 11165 return; | |
| 11166 | |
| 11167 p = alloc((unsigned)(STRLEN(f) + 1 + isdir)); | |
| 11168 if (p == NULL) | |
| 11169 return; | |
| 11170 | |
| 11171 STRCPY(p, f); | |
| 11172 #ifdef BACKSLASH_IN_FILENAME | |
| 11173 slash_adjust(p); | |
| 11174 #endif | |
| 11175 /* | |
| 11176 * Append a slash or backslash after directory names if none is present. | |
| 11177 */ | |
| 11178 #ifndef DONT_ADD_PATHSEP_TO_DIR | |
| 11179 if (isdir && (flags & EW_ADDSLASH)) | |
| 11180 add_pathsep(p); | |
| 11181 #endif | |
| 11182 ((char_u **)gap->ga_data)[gap->ga_len++] = p; | |
| 11183 } | |
| 11184 #endif /* !NO_EXPANDPATH */ | |
| 11185 | |
| 11186 #if defined(VIM_BACKTICK) || defined(FEAT_EVAL) || defined(PROTO) | |
| 11187 | |
| 11188 #ifndef SEEK_SET | |
| 11189 # define SEEK_SET 0 | |
| 11190 #endif | |
| 11191 #ifndef SEEK_END | |
| 11192 # define SEEK_END 2 | |
| 11193 #endif | |
| 11194 | |
| 11195 /* | |
| 11196 * Get the stdout of an external command. | |
| 5808 | 11197 * If "ret_len" is NULL replace NUL characters with NL. When "ret_len" is not |
| 11198 * NULL store the length there. | |
| 7 | 11199 * Returns an allocated string, or NULL for error. |
| 11200 */ | |
| 11201 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11202 get_cmd_output( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11203 char_u *cmd, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11204 char_u *infile, /* optional input file name */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11205 int flags, /* can be SHELL_SILENT */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11206 int *ret_len) |
| 7 | 11207 { |
| 11208 char_u *tempname; | |
| 11209 char_u *command; | |
| 11210 char_u *buffer = NULL; | |
| 11211 int len; | |
| 11212 int i = 0; | |
| 11213 FILE *fd; | |
| 11214 | |
| 11215 if (check_restricted() || check_secure()) | |
| 11216 return NULL; | |
| 11217 | |
| 11218 /* get a name for the temp file */ | |
| 6721 | 11219 if ((tempname = vim_tempname('o', FALSE)) == NULL) |
| 7 | 11220 { |
| 11221 EMSG(_(e_notmp)); | |
| 11222 return NULL; | |
| 11223 } | |
| 11224 | |
| 11225 /* Add the redirection stuff */ | |
| 24 | 11226 command = make_filter_cmd(cmd, infile, tempname); |
| 7 | 11227 if (command == NULL) |
| 11228 goto done; | |
| 11229 | |
| 11230 /* | |
| 11231 * Call the shell to execute the command (errors are ignored). | |
| 11232 * Don't check timestamps here. | |
| 11233 */ | |
| 11234 ++no_check_timestamps; | |
| 11235 call_shell(command, SHELL_DOOUT | SHELL_EXPAND | flags); | |
| 11236 --no_check_timestamps; | |
| 11237 | |
| 11238 vim_free(command); | |
| 11239 | |
| 11240 /* | |
| 11241 * read the names from the file into memory | |
| 11242 */ | |
| 11243 # ifdef VMS | |
| 1224 | 11244 /* created temporary file is not always readable as binary */ |
| 7 | 11245 fd = mch_fopen((char *)tempname, "r"); |
| 11246 # else | |
| 11247 fd = mch_fopen((char *)tempname, READBIN); | |
| 11248 # endif | |
| 11249 | |
| 11250 if (fd == NULL) | |
| 11251 { | |
| 11252 EMSG2(_(e_notopen), tempname); | |
| 11253 goto done; | |
| 11254 } | |
| 11255 | |
| 11256 fseek(fd, 0L, SEEK_END); | |
| 11257 len = ftell(fd); /* get size of temp file */ | |
| 11258 fseek(fd, 0L, SEEK_SET); | |
| 11259 | |
| 11260 buffer = alloc(len + 1); | |
| 11261 if (buffer != NULL) | |
| 11262 i = (int)fread((char *)buffer, (size_t)1, (size_t)len, fd); | |
| 11263 fclose(fd); | |
| 11264 mch_remove(tempname); | |
| 11265 if (buffer == NULL) | |
| 11266 goto done; | |
| 11267 #ifdef VMS | |
| 11268 len = i; /* VMS doesn't give us what we asked for... */ | |
| 11269 #endif | |
| 11270 if (i != len) | |
| 11271 { | |
| 11272 EMSG2(_(e_notread), tempname); | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13188
diff
changeset
|
11273 VIM_CLEAR(buffer); |
| 7 | 11274 } |
| 5808 | 11275 else if (ret_len == NULL) |
|
5271
25f67b62afd8
updated for version 7.4b.012
Bram Moolenaar <bram@vim.org>
parents:
5104
diff
changeset
|
11276 { |
|
25f67b62afd8
updated for version 7.4b.012
Bram Moolenaar <bram@vim.org>
parents:
5104
diff
changeset
|
11277 /* Change NUL into SOH, otherwise the string is truncated. */ |
|
25f67b62afd8
updated for version 7.4b.012
Bram Moolenaar <bram@vim.org>
parents:
5104
diff
changeset
|
11278 for (i = 0; i < len; ++i) |
|
5275
3ddec3d25bd1
updated for version 7.4b.014
Bram Moolenaar <bram@vim.org>
parents:
5271
diff
changeset
|
11279 if (buffer[i] == NUL) |
|
3ddec3d25bd1
updated for version 7.4b.014
Bram Moolenaar <bram@vim.org>
parents:
5271
diff
changeset
|
11280 buffer[i] = 1; |
|
5271
25f67b62afd8
updated for version 7.4b.012
Bram Moolenaar <bram@vim.org>
parents:
5104
diff
changeset
|
11281 |
|
2429
7ce8b24450dc
Improvements for ":find" completion. (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2409
diff
changeset
|
11282 buffer[len] = NUL; /* make sure the buffer is terminated */ |
|
5271
25f67b62afd8
updated for version 7.4b.012
Bram Moolenaar <bram@vim.org>
parents:
5104
diff
changeset
|
11283 } |
| 5808 | 11284 else |
| 11285 *ret_len = len; | |
| 7 | 11286 |
| 11287 done: | |
| 11288 vim_free(tempname); | |
| 11289 return buffer; | |
| 11290 } | |
| 11291 #endif | |
| 11292 | |
| 11293 /* | |
| 11294 * Free the list of files returned by expand_wildcards() or other expansion | |
| 11295 * functions. | |
| 11296 */ | |
| 11297 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11298 FreeWild(int count, char_u **files) |
| 7 | 11299 { |
| 838 | 11300 if (count <= 0 || files == NULL) |
| 7 | 11301 return; |
| 11302 while (count--) | |
| 11303 vim_free(files[count]); | |
| 11304 vim_free(files); | |
| 11305 } | |
| 11306 | |
| 11307 /* | |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2297
diff
changeset
|
11308 * Return TRUE when need to go to Insert mode because of 'insertmode'. |
| 7 | 11309 * Don't do this when still processing a command or a mapping. |
| 11310 * Don't do this when inside a ":normal" command. | |
| 11311 */ | |
| 11312 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11313 goto_im(void) |
| 7 | 11314 { |
| 11315 return (p_im && stuff_empty() && typebuf_typed()); | |
| 11316 } | |
| 5867 | 11317 |
| 11318 /* | |
| 5911 | 11319 * Returns the isolated name of the shell in allocated memory: |
| 5867 | 11320 * - Skip beyond any path. E.g., "/usr/bin/csh -f" -> "csh -f". |
| 11321 * - Remove any argument. E.g., "csh -f" -> "csh". | |
| 11322 * But don't allow a space in the path, so that this works: | |
| 11323 * "/usr/bin/csh --rcfile ~/.cshrc" | |
| 11324 * But don't do that for Windows, it's common to have a space in the path. | |
| 11325 */ | |
| 11326 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
11327 get_isolated_shell_name(void) |
| 5867 | 11328 { |
| 11329 char_u *p; | |
| 11330 | |
| 11331 #ifdef WIN3264 | |
| 11332 p = gettail(p_sh); | |
| 11333 p = vim_strnsave(p, (int)(skiptowhite(p) - p)); | |
| 11334 #else | |
| 11335 p = skiptowhite(p_sh); | |
| 11336 if (*p == NUL) | |
| 11337 { | |
| 11338 /* No white space, use the tail. */ | |
| 11339 p = vim_strsave(gettail(p_sh)); | |
| 11340 } | |
| 11341 else | |
| 11342 { | |
| 11343 char_u *p1, *p2; | |
| 11344 | |
| 11345 /* Find the last path separator before the space. */ | |
| 11346 p1 = p_sh; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
11347 for (p2 = p_sh; p2 < p; MB_PTR_ADV(p2)) |
| 5867 | 11348 if (vim_ispathsep(*p2)) |
| 11349 p1 = p2 + 1; | |
| 11350 p = vim_strnsave(p1, (int)(p - p1)); | |
| 11351 } | |
| 11352 #endif | |
| 11353 return p; | |
| 11354 } |