From 63983316bd05f189cb98907024f911435c1475fd Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 30 Jan 2020 21:28:51 -0500 Subject: vim-patch:8.2.0014: test69 and test95 are old style Problem: Test69 and test95 are old style. Solution: Convert to new style tests. (Yegappan Lakshmanan, closes vim/vim#5365) https://github.com/vim/vim/commit/afc13bd8271819c7871ff2ae2cfebb22190a0d39 --- src/nvim/testdir/test_textformat.vim | 423 +++++++++++++++++++++++++++++++++++ 1 file changed, 423 insertions(+) (limited to 'src/nvim/testdir/test_textformat.vim') diff --git a/src/nvim/testdir/test_textformat.vim b/src/nvim/testdir/test_textformat.vim index 13fb50b985..1f87fbd31a 100644 --- a/src/nvim/testdir/test_textformat.vim +++ b/src/nvim/testdir/test_textformat.vim @@ -489,3 +489,426 @@ func Test_format_list_auto() bwipe! set fo& ai& bs& endfunc + +" Test for formatting multi-byte text with 'fo=t' +func Test_tw_2_fo_t() + new + let t =<< trim END + { + ＸＹＺ + abc ＸＹＺ + } + END + call setline(1, t) + call cursor(2, 1) + + set tw=2 fo=t + let t =<< trim END + ＸＹＺ + abc ＸＹＺ + END + exe "normal gqgqjgqgq" + exe "normal o\n" . join(t, "\n") + + let expected =<< trim END + { + ＸＹＺ + abc + ＸＹＺ + + ＸＹＺ + abc + ＸＹＺ + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& + bwipe! +endfunc + +" Test for formatting multi-byte text with 'fo=tm' and 'tw=1' +func Test_tw_1_fo_tm() + new + let t =<< trim END + { + Ｘ + Ｘa + Ｘ a + ＸＹ + Ｘ Ｙ + } + END + call setline(1, t) + call cursor(2, 1) + + set tw=1 fo=tm + let t =<< trim END + Ｘ + Ｘa + Ｘ a + ＸＹ + Ｘ Ｙ + END + exe "normal gqgqjgqgqjgqgqjgqgqjgqgq" + exe "normal o\n" . join(t, "\n") + + let expected =<< trim END + { + Ｘ + Ｘ + a + Ｘ + a + Ｘ + Ｙ + Ｘ + Ｙ + + Ｘ + Ｘ + a + Ｘ + a + Ｘ + Ｙ + Ｘ + Ｙ + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& + bwipe! +endfunc + +" Test for formatting multi-byte text with 'fo=tm' and 'tw=2' +func Test_tw_2_fo_tm() + new + let t =<< trim END + { + Ｘ + Ｘa + Ｘ a + ＸＹ + Ｘ Ｙ + aＸ + abＸ + abcＸ + abＸ c + abＸＹ + } + END + call setline(1, t) + call cursor(2, 1) + + set tw=2 fo=tm + let t =<< trim END + Ｘ + Ｘa + Ｘ a + ＸＹ + Ｘ Ｙ + aＸ + abＸ + abcＸ + abＸ c + abＸＹ + END + exe "normal gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgq" + exe "normal o\n" . join(t, "\n") + + let expected =<< trim END + { + Ｘ + Ｘ + a + Ｘ + a + Ｘ + Ｙ + Ｘ + Ｙ + a + Ｘ + ab + Ｘ + abc + Ｘ + ab + Ｘ + c + ab + Ｘ + Ｙ + + Ｘ + Ｘ + a + Ｘ + a + Ｘ + Ｙ + Ｘ + Ｙ + a + Ｘ + ab + Ｘ + abc + Ｘ + ab + Ｘ + c + ab + Ｘ + Ｙ + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& + bwipe! +endfunc + +" Test for formatting multi-byte text with 'fo=tm', 'tw=2' and 'autoindent'. +func Test_tw_2_fo_tm_ai() + new + let t =<< trim END + { + Ｘ + Ｘa + } + END + call setline(1, t) + call cursor(2, 1) + + set ai tw=2 fo=tm + let t =<< trim END + Ｘ + Ｘa + END + exe "normal gqgqjgqgq" + exe "normal o\n" . join(t, "\n") + + let expected =<< trim END + { + Ｘ + Ｘ + a + + Ｘ + Ｘ + a + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& ai& + bwipe! +endfunc + +" Test for formatting multi-byte text with 'fo=tm', 'tw=2' and 'noai'. +func Test_tw_2_fo_tm_noai() + new + let t =<< trim END + { + Ｘ + Ｘa + } + END + call setline(1, t) + call cursor(2, 1) + + set noai tw=2 fo=tm + exe "normal gqgqjgqgqo\n Ｘ\n Ｘa" + + let expected =<< trim END + { + Ｘ + Ｘ + a + + Ｘ + Ｘ + a + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& ai& + bwipe! +endfunc + +func Test_tw_2_fo_cqm_com() + new + let t =<< trim END + { + Ｘ + Ｘa + ＸaＹ + ＸＹ + ＸＹＺ + Ｘ Ｙ + Ｘ ＹＺ + ＸＸ + ＸＸa + ＸＸＹ + } + END + call setline(1, t) + call cursor(2, 1) + + set tw=2 fo=cqm comments=n:Ｘ + exe "normal gqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgqjgqgq" + let t =<< trim END + Ｘ + Ｘa + ＸaＹ + ＸＹ + ＸＹＺ + Ｘ Ｙ + Ｘ ＹＺ + ＸＸ + ＸＸa + ＸＸＹ + END + exe "normal o\n" . join(t, "\n") + + let expected =<< trim END + { + Ｘ + Ｘa + Ｘa + ＸＹ + ＸＹ + ＸＹ + ＸＺ + Ｘ Ｙ + Ｘ Ｙ + Ｘ Ｚ + ＸＸ + ＸＸa + ＸＸＹ + + Ｘ + Ｘa + Ｘa + ＸＹ + ＸＹ + ＸＹ + ＸＺ + Ｘ Ｙ + Ｘ Ｙ + Ｘ Ｚ + ＸＸ + ＸＸa + ＸＸＹ + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& comments& + bwipe! +endfunc + +func Test_tw_2_fo_tm_replace() + new + let t =<< trim END + { + + } + END + call setline(1, t) + call cursor(2, 1) + + set tw=2 fo=tm + exe "normal RＸa" + + let expected =<< trim END + { + Ｘ + a + } + END + call assert_equal(expected, getline(1, '$')) + + set tw& fo& + bwipe! +endfunc + +" Test for 'matchpairs' with multibyte chars +func Test_mps() + new + let t =<< trim END + { + ‘ two three ’ four + } + END + call setline(1, t) + call cursor(2, 1) + + exe "set mps+=\u2018:\u2019" + normal d% + + let expected =<< trim END + { + four + } + END + call assert_equal(expected, getline(1, '$')) + + set mps& + bwipe! +endfunc + +" Test for ra on multi-byte characters +func Test_ra_multibyte() + new + let t =<< trim END + ra test + ａbbａ + ａａb + END + call setline(1, t) + call cursor(1, 1) + + normal jVjra + + let expected =<< trim END + ra test + aaaa + aaa + END + call assert_equal(expected, getline(1, '$')) + + bwipe! +endfunc + +" Test for 'whichwrap' with multi-byte character +func Test_whichwrap() + new + let t =<< trim END + á + x + END + call setline(1, t) + call cursor(2, 1) + + set whichwrap+=h + normal dh + set whichwrap-=h + + let expected =<< trim END + áx + END + call assert_equal(expected, getline(1, '$')) + + bwipe! +endfunc + +func Test_substitute() + call assert_equal('a１a２a３a', substitute('１２３', '\zs', 'a', 'g')) +endfunc + +" vim: shiftwidth=2 sts=2 expandtab -- cgit From ef11b800ac379dd7171c090f5f9f995aedae9bd2 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 30 Jan 2020 21:30:33 -0500 Subject: vim-patch:8.2.0016: test name used twice, option not restored properly Problem: Test name used twice, option not restored properly. Solution: Rename function, restore option with "&". https://github.com/vim/vim/commit/a48e78e11f2b647183fd12f569020756b17d7683 --- src/nvim/testdir/test_textformat.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/test_textformat.vim') diff --git a/src/nvim/testdir/test_textformat.vim b/src/nvim/testdir/test_textformat.vim index 1f87fbd31a..75673adf0a 100644 --- a/src/nvim/testdir/test_textformat.vim +++ b/src/nvim/testdir/test_textformat.vim @@ -886,7 +886,7 @@ func Test_ra_multibyte() endfunc " Test for 'whichwrap' with multi-byte character -func Test_whichwrap() +func Test_whichwrap_multi_byte() new let t =<< trim END á @@ -897,7 +897,7 @@ func Test_whichwrap() set whichwrap+=h normal dh - set whichwrap-=h + set whichwrap& let expected =<< trim END áx -- cgit