kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17334 from zeertzjq/vim-8.2.4326

Browse Source 
vim-patch:8.2.4326: "o" and "O" copying comment not sufficiently tested
This commit is contained in:
zeertzjq 2022-02-08 21:45:39 +08:00 committed by GitHub
commit 1a5e893cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/change.c
View File

@ -1201,10 +1201,10 @@ int open_line(int dir, int flags, int second_line_indent, bool *did_do_comment)
// Find out if the current line starts with a comment leader.
// This may then be inserted in front of the new line.
end_comment_pending = NUL;
if (flags & OPENLINE_DO_COM && dir == FORWARD) {
// Check for a line comment after code.
if (flags & OPENLINE_DO_COM) {
lead_len = get_leader_len(saved_line, &lead_flags, dir == BACKWARD, true);
if (lead_len == 0 && do_cindent) {
if (lead_len == 0 && do_cindent && dir == FORWARD) {
// Check for a line comment after code.
comment_start = check_linecomment(saved_line);
if (comment_start != MAXCOL) {
lead_len = get_leader_len(saved_line + comment_start,

28
src/nvim/testdir/test_textformat.vim
View File

@ -238,7 +238,33 @@ func Test_format_c_comment()
END
call assert_equal(expected, getline(1, '$'))
" Using "o" repeats the line comment, "O" does not.
" Using either "o" or "O" repeats a line comment occupying a whole line.
%del
let text =<< trim END
nop;
// This is a comment
val = val;
END
call setline(1, text)
normal 2Go
let expected =<< trim END
nop;
// This is a comment
//
val = val;
END
call assert_equal(expected, getline(1, '$'))
normal 2GO
let expected =<< trim END
nop;
//
// This is a comment
//
val = val;
END
call assert_equal(expected, getline(1, '$'))
" Using "o" repeats a line comment after a statement, "O" does not.
%del
let text =<< trim END
nop;