patch 9.1.1293: comment plugin does not handle 'exclusive' selection for comment object
Commit: https://github.com/vim/vim/commit/0e59e67a63ed4abe0627a5ccf74763bdaece74ab Author: Maxim Kim <haba...@gmail.com> Date: Sat Apr 12 11:34:08 2025 +0200 patch 9.1.1293: comment plugin does not handle 'exclusive' selection for comment object Problem: comment plugin does not handle 'exclusive' selection for comment object (@mawkish) Solution: handle special case selection='exclusive' for inline comment object (Maxim Kim) fixes: #17023 closes: #17098 Signed-off-by: Maxim Kim <haba...@gmail.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/runtime/pack/dist/opt/comment/autoload/comment.vim b/runtime/pack/dist/opt/comment/autoload/comment.vim index 183351d19..a0ee7a72f 100644 --- a/runtime/pack/dist/opt/comment/autoload/comment.vim +++ b/runtime/pack/dist/opt/comment/autoload/comment.vim @@ -158,6 +158,9 @@ export def ObjComment(inner: bool) else cursor(pos_end[1], pos_end[2]) normal! v + if &selection == 'exclusive' + normal! lo + endif cursor(pos_start[1], pos_start[2]) endif enddef diff --git a/src/testdir/test_plugin_comment.vim b/src/testdir/test_plugin_comment.vim index 992a4f1b5..d4718bc52 100644 --- a/src/testdir/test_plugin_comment.vim +++ b/src/testdir/test_plugin_comment.vim @@ -677,3 +677,26 @@ func Test_inline_uncomment() let result = readfile(output_file) call assert_equal(['echo "Hello" This should be a comment'], result) endfunc + +func Test_textobj_selection_exclusive_inline_comment() + CheckScreendump + let lines =<< trim END + print("Hello") # selection exclusive + END + + let input_file = "test_selection_exclusive_inline_comment_input.py" + call writefile(lines, input_file, "D") + + let buf = RunVimInTerminal('-c "set selection=exclusive" -c "packadd comment" ' .. input_file, {}) + + call term_sendkeys(buf, "dac") + + let output_file = "test_selection_exclusive_inline_comment.py" + call term_sendkeys(buf, $":w {output_file}\<CR>") + defer delete(output_file) + + call StopVimInTerminal(buf) + + let result = readfile(output_file) + call assert_equal(['print("Hello")'], result) +endfunc diff --git a/src/version.c b/src/version.c index 1b1cfd6b3..726629cde 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1293, /**/ 1292, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1u3XQ9-00Fovd-Rt%40256bit.org.
