aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.2.3787: no proper formatting of a C line comment after a statement

Browse Source 
Problem:    No proper formatting of a C line comment after a statement.
Solution:   Find the start of the line comment, insert the comment leader and
            indent the comment properly.
This commit is contained in:
Bram Moolenaar
2021-12-12 14:16:39 +00:00
parent 9a4ec5a626
commit 6e371ecb27
11 changed files with 118 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/cindent.c
View File

@@ -2144,13 +2144,30 @@ get_c_indent(void)
// If we're inside a "//" comment and there is a "//" comment in a
// previous line, lineup with that one.
if (cin_islinecomment(theline)
&& (trypos = find_line_comment()) != NULL) // XXX
if (cin_islinecomment(theline))
{
// find how indented the line beginning the comment is
getvcol(curwin, trypos, &col, NULL, NULL);
amount = col;
goto theend;
pos_T linecomment_pos;
trypos = find_line_comment(); // XXX
if (trypos == NULL && curwin->w_cursor.lnum > 1)
{
// There may be a statement before the comment, search from the end
// of the line for a comment start.
linecomment_pos.col =
check_linecomment(ml_get(curwin->w_cursor.lnum - 1));
if (linecomment_pos.col != MAXCOL)
{
trypos = &linecomment_pos;
trypos->lnum = curwin->w_cursor.lnum - 1;
}
}
if (trypos != NULL)
{
// find how indented the line beginning the comment is
getvcol(curwin, trypos, &col, NULL, NULL);
amount = col;
goto theend;
}
}
// If we're inside a comment and not looking at the start of the