Mercurial > vim
view src/testdir/test_comments.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +0100 |
parents | 1fa23ccd6d9a |
children |
line wrap: on
line source
" Tests for the various flags in the 'comments' option " Test for the 'n' flag in 'comments' func Test_comment_nested() new setlocal comments=n:> fo+=ro exe "normal i> B\nD\<C-C>ggOA\<C-C>joC\<C-C>Go\<BS>>>> F\nH" exe "normal 5GOE\<C-C>6GoG" let expected =<< trim END > A > B > C > D >>>> E >>>> F >>>> G >>>> H END call assert_equal(expected, getline(1, '$')) close! endfunc " Test for the 'b' flag in 'comments' func Test_comment_blank() new setlocal comments=b:* fo+=ro exe "normal i* E\nF\n\<BS>G\nH\<C-C>ggOC\<C-C>O\<BS>B\<C-C>OA\<C-C>2joD" let expected =<< trim END A *B * C * D * E * F *G H END call assert_equal(expected, getline(1, '$')) close! endfunc " Test for the 'f' flag in 'comments' (only the first line has a comment " string) func Test_comment_firstline() new setlocal comments=f:- fo+=ro exe "normal i- B\nD\<C-C>ggoC\<C-C>ggOA\<C-C>" call assert_equal(['A', '- B', ' C', ' D'], getline(1, '$')) %d setlocal comments=:- exe "normal i- B\nD\<C-C>ggoC\<C-C>ggOA\<C-C>" call assert_equal(['- A', '- B', '- C', '- D'], getline(1, '$')) close! endfunc " Test for the 's', 'm' and 'e' flags in 'comments' " Test for automatically adding comment leaders in insert mode func Test_comment_threepiece() new setlocal expandtab call setline(1, ["\t/*"]) setlocal formatoptions=croql call cursor(1, 3) call feedkeys("A\<cr>\<cr>/", 'tnix') call assert_equal(["\t/*", " *", " */"], getline(1, '$')) " If a comment ends in a single line, then don't add it in the next line %d call setline(1, '/* line1 */') call feedkeys("A\<CR>next line", 'xt') call assert_equal(['/* line1 */', 'next line'], getline(1, '$')) %d " Copy the trailing indentation from the leader comment to a new line setlocal autoindent noexpandtab call feedkeys("a\t/*\tone\ntwo\n/", 'xt') call assert_equal(["\t/*\tone", "\t *\ttwo", "\t */"], getline(1, '$')) close! endfunc " Test for the 'r' flag in 'comments' (right align comment) func Test_comment_rightalign() new setlocal comments=sr:/***,m:**,ex-2:******/ fo+=ro exe "normal i=\<C-C>o\t /***\nD\n/" exe "normal 2GOA\<C-C>joB\<C-C>jOC\<C-C>joE\<C-C>GOF\<C-C>joG" let expected =<< trim END = A /*** ** B ** C ** D ** E ** F ******/ G END call assert_equal(expected, getline(1, '$')) close! endfunc " Test for the 'O' flag in 'comments' func Test_comment_O() new setlocal comments=Ob:* fo+=ro exe "normal i* B\nD\<C-C>kOA\<C-C>joC" let expected =<< trim END A * B * C * D END call assert_equal(expected, getline(1, '$')) close! endfunc " Test for using a multibyte character as a comment leader func Test_comment_multibyte_leader() new let t =<< trim END { X Xa XaY XY XYZ X Y X YZ XX XXa XXY } END call setline(1, t) call cursor(2, 1) set tw=2 fo=cqm comments=n:X exe "normal gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgq" let t =<< trim END X Xa XaY XY XYZ X Y X YZ XX XXa XXY END exe "normal o\n" . join(t, "\n") let expected =<< trim END { X Xa Xa XY XY XY XZ X Y X Y X Z XX XXa XXY X Xa Xa XY XY XY XZ X Y X Y X Z XX XXa XXY } END call assert_equal(expected, getline(1, '$')) set tw& fo& comments& close! endfunc " Test for a space character in 'comments' setting func Test_comment_space() new setlocal comments=b:\ > fo+=ro exe "normal i> B\nD\<C-C>ggOA\<C-C>joC" exe "normal Go > F\nH\<C-C>kOE\<C-C>joG" let expected =<< trim END A > B C D > E > F > G > H END call assert_equal(expected, getline(1, '$')) close! endfunc " Test for formatting lines with and without comments func Test_comment_format_lines() new call setline(1, ['one', '/* two */', 'three']) normal gggqG call assert_equal(['one', '/* two */', 'three'], getline(1, '$')) close! endfunc " Test for using 'a' in 'formatoptions' with comments func Test_comment_autoformat() new setlocal formatoptions+=a call feedkeys("a- one\n- two\n", 'xt') call assert_equal(['- one', '- two', ''], getline(1, '$')) %d call feedkeys("a\none\n", 'xt') call assert_equal(['', 'one', ''], getline(1, '$')) setlocal formatoptions+=aw %d call feedkeys("aone \ntwo\n", 'xt') call assert_equal(['one two', ''], getline(1, '$')) %d call feedkeys("aone\ntwo\n", 'xt') call assert_equal(['one', 'two', ''], getline(1, '$')) set backspace=indent,eol,start %d call feedkeys("aone \n\<BS>", 'xt') call assert_equal(['one'], getline(1, '$')) set backspace& close! endfunc " Test for joining lines with comments ('j' flag in 'formatoptions') func Test_comment_join_lines_fo_j() new setlocal fo+=j comments=:// call setline(1, ['i++; // comment1', ' // comment2']) normal J call assert_equal('i++; // comment1 comment2', getline(1)) setlocal fo-=j call setline(1, ['i++; // comment1', ' // comment2']) normal J call assert_equal('i++; // comment1 // comment2', getline(1)) " Test with nested comments setlocal fo+=j comments=n:>,n:) call setline(1, ['i++; > ) > ) comment1', ' > ) comment2']) normal J call assert_equal('i++; > ) > ) comment1 comment2', getline(1)) close! endfunc " Test for formatting lines where only the first line has a comment. func Test_comment_format_firstline_comment() new setlocal formatoptions=tcq call setline(1, ['- one two', 'three']) normal gggqG call assert_equal(['- one two three'], getline(1, '$')) %d call setline(1, ['- one', '- two']) normal gggqG call assert_equal(['- one', '- two'], getline(1, '$')) close! endfunc " vim: shiftwidth=2 sts=2 expandtab