thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3932: C line comment not formatted properly

Browse Source 
Problem:    C line comment not formatted properly.
Solution:   If a line comment follows after "#if" the next line is not the end
            of a paragraph.
This commit is contained in:
Bram Moolenaar
2021-12-29 14:09:32 +00:00
parent febb78fa17
commit 264d3ddac0
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/textformat.c
View File

@@ -193,7 +193,8 @@ internal_format(
if (curwin->w_cursor.col <= (colnr_T)wantcol)
break;
}
else if ((cc >= 0x100 || !utf_allow_break_before(cc)) && fo_multibyte)
else if ((cc >= 0x100 || !utf_allow_break_before(cc))
&& fo_multibyte)
{
int ncc;
int allow_break;
@@ -948,7 +949,7 @@ format_lines(
int leader_len = 0; // leader len of current line
int next_leader_len; // leader len of next line
char_u *leader_flags = NULL; // flags for leader of current line
char_u *next_leader_flags; // flags for leader of next line
char_u *next_leader_flags = NULL; // flags for leader of next line
int do_comments; // format comments
int do_comments_list = 0; // format comments with 'n' or '2'
int advance = TRUE;
@@ -1071,7 +1072,15 @@ format_lines(
|| !same_leader(curwin->w_cursor.lnum,
leader_len, leader_flags,
next_leader_len, next_leader_flags))
{
// Special case: If the next line starts with a line comment
// and this line has a line comment after some text, the
// paragraph doesn't really end.
if (next_leader_flags == NULL
|| STRNCMP(next_leader_flags, "://", 3) != 0
|| check_linecomment(ml_get_curline()) == MAXCOL)
is_end_par = TRUE;
}
// If we have got to the end of a paragraph, or the line is
// getting long, format it.