From 1b1cc4d864b4b15e705c1a500e64c7bfbacedae7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 8 May 2022 07:51:12 +0800 Subject: vim-patch:8.2.4908: no text formatting for // comment after a statement (#18472) Problem: No text formatting for // comment after a statement. Solution: format a comment when the 'c' flag is in 'formatoptions'. https://github.com/vim/vim/commit/48a8a833033e10fc1eba96f2fc8dd19c2408eddf --- src/nvim/edit.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/nvim/edit.c') diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 3821cd3f41..e7c9eea27b 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -6033,7 +6033,18 @@ static void internal_format(int textwidth, int second_indent, int flags, int for // Don't break until after the comment leader if (do_comments) { - leader_len = get_leader_len(get_cursor_line_ptr(), NULL, false, true); + char_u *line = get_cursor_line_ptr(); + leader_len = get_leader_len(line, NULL, false, true); + if (leader_len == 0 && curbuf->b_p_cin) { + // Check for a line comment after code. + int comment_start = check_linecomment(line); + if (comment_start != MAXCOL) { + leader_len = get_leader_len(line + comment_start, NULL, false, true); + if (leader_len != 0) { + leader_len += comment_start; + } + } + } } else { leader_len = 0; } -- cgit