Mercurial > vim
view src/testdir/test_cjk_linebreak.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 | 08940efa6b4e |
children |
line wrap: on
line source
" Test for CJK linebreak scriptencoding utf-8 func Run_cjk_linebreak_after(rigorous) set textwidth=12 for punct in [ \ '!', '%', ')', ',', ':', ';', '>', '?', ']', '}', '’', '”', '†', '‡', \ '…', '‰', '‱', '‼', '⁇', '⁈', '⁉', '℃', '℉', '、', '。', '〉', '》', \ '」', '』', '】', '〕', '〗', '〙', '〛', '!', ')', ',', '.', ':', \ ';', '?', ']', '}'] call setline('.', '这是一个测试' .. punct.'试试 CJK 行禁则补丁。') normal gqq if a:rigorous call assert_equal('这是一个测', getline(1)) else call assert_equal('这是一个测试' .. punct, getline(1)) endif %d_ endfor endfunc func Test_cjk_linebreak_after() set formatoptions=croqn2mB1j call Run_cjk_linebreak_after(0) endfunc func Test_cjk_linebreak_after_rigorous() set formatoptions=croqn2mB1j] call Run_cjk_linebreak_after(1) endfunc func Run_cjk_linebreak_before() set textwidth=12 for punct in [ \ '(', '<', '[', '`', '{', '‘', '“', '〈', '《', '「', '『', '【', '〔', \ '〖', '〘', '〚', '(', '[', '{'] call setline('.', '这是个测试' .. punct.'试试 CJK 行禁则补丁。') normal gqq call assert_equal('这是个测试', getline(1)) %d_ endfor endfunc func Test_cjk_linebreak_before() set formatoptions=croqn2mB1j call Run_cjk_linebreak_before() endfunc func Test_cjk_linebreak_before_rigorous() set formatoptions=croqn2mB1j] call Run_cjk_linebreak_before() endfunc func Run_cjk_linebreak_nobetween(rigorous) " …… must not start a line call setline('.', '这是个测试……试试 CJK 行禁则补丁。') set textwidth=12 ambiwidth=double normal gqq if a:rigorous call assert_equal('这是个测', getline(1)) else call assert_equal('这是个测试……', getline(1)) endif %d_ call setline('.', '这是一个测试……试试 CJK 行禁则补丁。') set textwidth=12 ambiwidth=double normal gqq call assert_equal('这是一个测', getline(1)) %d_ " but —— can call setline('.', '这是个测试——试试 CJK 行禁则补丁。') set textwidth=12 ambiwidth=double normal gqq call assert_equal('这是个测试', getline(1)) endfunc func Test_cjk_linebreak_nobetween() set formatoptions=croqn2mB1j call Run_cjk_linebreak_nobetween(0) endfunc func Test_cjk_linebreak_nobetween_rigorous() set formatoptions=croqn2mB1j] call Run_cjk_linebreak_nobetween(1) endfunc func Test_cjk_linebreak_join_punct() for punct in ['——', '〗', ',', '。', '……'] call setline(1, '文本文本' .. punct) call setline(2, 'English') set formatoptions=croqn2mB1j normal ggJ call assert_equal('文本文本' .. punct.'English', getline(1)) %d_ endfor endfunc " vim: shiftwidth=2 sts=2 expandtab