Mercurial > vim
changeset 15127:31a0127813cb v8.1.0574
patch 8.1.0574: 'commentstring' not used when adding fold marker in C
commit https://github.com/vim/vim/commit/4af7259b2b35e85c590d54908fcd248d2c733be8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 9 15:00:52 2018 +0100
patch 8.1.0574: 'commentstring' not used when adding fold marker in C
Problem: 'commentstring' not used when adding fold marker in C.
Solution: Require white space before middle comment part. (mostly by
Hirohito Higashi)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 09 Dec 2018 15:15:06 +0100 |
| parents | 5978f02b05e3 |
| children | 16186d27897d |
| files | src/misc1.c src/testdir/test_fold.vim src/version.c |
| diffstat | 3 files changed, 38 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -1993,7 +1993,6 @@ get_last_leader_offset(char_u *line, cha for (list = curbuf->b_p_com; *list; ) { char_u *flags_save = list; - int is_only_whitespace = FALSE; /* * Get one option part into part_buf[]. Advance list to next one. @@ -2021,8 +2020,6 @@ get_last_leader_offset(char_u *line, cha continue; while (VIM_ISWHITE(*string)) ++string; - if (*string == NUL) - is_only_whitespace = TRUE; } for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j) /* do nothing */; @@ -2037,11 +2034,13 @@ get_last_leader_offset(char_u *line, cha && !VIM_ISWHITE(line[i + j]) && line[i + j] != NUL) continue; - // For a middlepart comment that is only white space, only consider - // it to match if everything before the current position in the - // line is also whitespace. - if (is_only_whitespace && vim_strchr(part_buf, COM_MIDDLE) != NULL) - { + if (vim_strchr(part_buf, COM_MIDDLE) != NULL) + { + // For a middlepart comment, only consider it to match if + // everything before the current position in the line is + // whitespace. Otherwise we would think we are inside a + // comment if the middle part appears somewhere in the middle + // of the line. E.g. for C the "*" appears often. for (j = 0; VIM_ISWHITE(line[j]) && j <= i; j++) ; if (j < i)
--- a/src/testdir/test_fold.vim +++ b/src/testdir/test_fold.vim @@ -507,6 +507,35 @@ func Test_fold_marker() enew! endfunc +" test create fold markers with C filetype +func Test_fold_create_marker_in_C() + enew! + set fdm=marker fdl=9 + set filetype=c + + let content = [ + \ '/*', + \ ' * comment', + \ ' * ', + \ ' *', + \ ' */', + \ 'int f(int* p) {', + \ ' *p = 3;', + \ ' return 0;', + \ '}' + \] + for c in range(len(content) - 1) + bw! + call append(0, content) + call cursor(c + 1, 1) + norm! zfG + call assert_equal(content[c] . (c < 4 ? '{{{' : '/*{{{*/'), getline(c + 1)) + endfor + + set fdm& fdl& + enew! +endfunc + " test folding with indent func Test_fold_indent() enew!