To: vim_dev@googlegroups.com Subject: Patch 8.2.0912 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0912 Problem: A few test cases for CJK formatting are disabled. Solution: Fix the tests and enable them. (closes #6212) Files: src/testdir/test_cjk_linebreak.vim *** ../vim-8.2.0911/src/testdir/test_cjk_linebreak.vim 2020-06-04 18:21:56.046395485 +0200 --- src/testdir/test_cjk_linebreak.vim 2020-06-06 15:22:54.668389082 +0200 *************** *** 1,36 **** scriptencoding utf-8 ! func Run_cjk_linebreak_after() set textwidth=12 for punct in [ \ '!', '%', ')', ',', ':', ';', '>', '?', ']', '}', '’', '”', '†', '‡', \ '…', '‰', '‱', '‼', '⁇', '⁈', '⁉', '℃', '℉', '、', '。', '〉', '》', \ '」', '』', '】', '〕', '〗', '〙', '〛', '!', ')', ',', '.', ':', \ ';', '?', ']', '}'] ! call setline('.', '这是一个测试'.punct.'试试 CJK 行禁则补丁。') normal gqq ! call assert_equal('这是一个测试'.punct, getline(1)) %d_ endfor endfunc func Test_cjk_linebreak_after() set formatoptions=croqn2mB1j ! call Run_cjk_linebreak_after() endfunc ! " TODO: this test fails ! "func Test_cjk_linebreak_after_rigorous() ! " set formatoptions=croqn2mB1j] ! " call Run_cjk_linebreak_after() ! "endfunc func Run_cjk_linebreak_before() set textwidth=12 for punct in [ \ '(', '<', '[', '`', '{', '‘', '“', '〈', '《', '「', '『', '【', '〔', \ '〖', '〘', '〚', '(', '[', '{'] ! call setline('.', '这是个测试'.punct.'试试 CJK 行禁则补丁。') normal gqq call assert_equal('这是个测试', getline(1)) %d_ --- 1,39 ---- 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_ *************** *** 47,59 **** call Run_cjk_linebreak_before() endfunc ! func Run_cjk_linebreak_nobetween() " …… must not start a line call setline('.', '这是个测试……试试 CJK 行禁则补丁。') set textwidth=12 ambiwidth=double normal gqq ! " TODO: this fails ! " call assert_equal('这是个测试……', getline(1)) %d_ call setline('.', '这是一个测试……试试 CJK 行禁则补丁。') --- 50,65 ---- 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 行禁则补丁。') *************** *** 71,91 **** func Test_cjk_linebreak_nobetween() set formatoptions=croqn2mB1j ! call Run_cjk_linebreak_nobetween() endfunc func Test_cjk_linebreak_nobetween_rigorous() set formatoptions=croqn2mB1j] ! call Run_cjk_linebreak_nobetween() 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 --- 77,97 ---- 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-8.2.0911/src/version.c 2020-06-06 15:13:38.737950126 +0200 --- src/version.c 2020-06-06 15:21:16.176403999 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 912, /**/ -- Facepalm statement #7: "Last week I almost got pregnant!" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///