From 47da934844afec7b04d94e0d1f8cf0a86e1b9bea Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 27 Sep 2022 22:18:13 +0100 Subject: patch 9.0.0612: blockedit test passes with wrong result Problem: Blockedit test passes with wrong result. Solution: Add a "vim9script" line to make indenting work. --- src/testdir/test_blockedit.vim | 25 +++++++++++++------------ src/version.c | 2 ++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/testdir/test_blockedit.vim b/src/testdir/test_blockedit.vim index 779c6472a..8497efb08 100644 --- a/src/testdir/test_blockedit.vim +++ b/src/testdir/test_blockedit.vim @@ -17,6 +17,7 @@ endfunc func Test_blockinsert_autoindent() new let lines =<< trim END + vim9script var d = { a: () => 0, b: () => 0, @@ -27,42 +28,42 @@ func Test_blockinsert_autoindent() filetype plugin indent on setlocal sw=2 et ft=vim setlocal indentkeys+=: - exe "norm! 2Gf)\2jA: asdf\" - " FIXME: what do we really expect? + exe "norm! 3Gf)\2jA: asdf\" let expected =<< trim END + vim9script var d = { - a: (): asdf => 0, + a: (): asdf => 0, b: (): asdf => 0, c: (): asdf => 0, } END - call assert_equal(expected, getline(1, 5)) + call assert_equal(expected, getline(1, 6)) " insert on the next column should do exactly the same :%dele call setline(1, lines) - exe "norm! 2Gf)l\2jI: asdf\" - call assert_equal(expected, getline(1, 5)) + exe "norm! 3Gf)l\2jI: asdf\" + call assert_equal(expected, getline(1, 6)) :%dele call setline(1, lines) setlocal sw=8 noet - exe "norm! 2Gf)\2jA: asdf\" - " FIXME: what do we really expect? + exe "norm! 3Gf)\2jA: asdf\" let expected =<< trim END + vim9script var d = { - a: (): asdf => 0, + a: (): asdf => 0, b: (): asdf => 0, c: (): asdf => 0, } END - call assert_equal(expected, getline(1, 5)) + call assert_equal(expected, getline(1, 6)) " insert on the next column should do exactly the same :%dele call setline(1, lines) - exe "norm! 2Gf)l\2jI: asdf\" - call assert_equal(expected, getline(1, 5)) + exe "norm! 3Gf)l\2jI: asdf\" + call assert_equal(expected, getline(1, 6)) filetype off bwipe! diff --git a/src/version.c b/src/version.c index b582b264b..e92207e36 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 612, /**/ 611, /**/ -- cgit v1.2.1