Patch 9.0.0612

[Bram Moolenaar]

Patch 9.0.0612 (after 9.0.0609)
Problem: Blockedit test passes with wrong result.
Solution: Add a "vim9script" line to make indenting work.
Files: src/testdir/test_blockedit.vim


*** ../vim-9.0.0611/src/testdir/test_blockedit.vim 2022-09-27 17:47:09.336830388 +0100
--- src/testdir/test_blockedit.vim 2022-09-27 22:16:04.113142148 +0100
***************
*** 17,22 ****
--- 17,23 ----
func Test_blockinsert_autoindent()
new
let lines =<< trim END
+ vim9script
var d = {
a: () => 0,
b: () => 0,
***************
*** 27,68 ****
filetype plugin indent on
setlocal sw=2 et ft=vim
setlocal indentkeys+=:
! exe "norm! 2Gf)\<c-v>2jA: asdf\<esc>"
! " FIXME: what do we really expect?
let expected =<< trim END
var d = {
! a: (): asdf => 0,
b: (): asdf => 0,
c: (): asdf => 0,
}
END
! call assert_equal(expected, getline(1, 5))

" insert on the next column should do exactly the same
:%dele
call setline(1, lines)
! exe "norm! 2Gf)l\<c-v>2jI: asdf\<esc>"
! call assert_equal(expected, getline(1, 5))

:%dele
call setline(1, lines)
setlocal sw=8 noet
! exe "norm! 2Gf)\<c-v>2jA: asdf\<esc>"
! " FIXME: what do we really expect?
let expected =<< trim END
var d = {
! a: (): asdf => 0,
b: (): asdf => 0,
c: (): asdf => 0,
}
END
! call assert_equal(expected, getline(1, 5))

" insert on the next column should do exactly the same
:%dele
call setline(1, lines)
! exe "norm! 2Gf)l\<c-v>2jI: asdf\<esc>"
! call assert_equal(expected, getline(1, 5))

filetype off
bwipe!
--- 28,69 ----
filetype plugin indent on
setlocal sw=2 et ft=vim
setlocal indentkeys+=:
! exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
let expected =<< trim END
+ vim9script
var d = {
! a: (): asdf => 0,
b: (): asdf => 0,
c: (): asdf => 0,
}
END
! call assert_equal(expected, getline(1, 6))

" insert on the next column should do exactly the same
:%dele
call setline(1, lines)
! exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>"
! call assert_equal(expected, getline(1, 6))

:%dele
call setline(1, lines)
setlocal sw=8 noet
! exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
let expected =<< trim END
+ vim9script
var d = {
! a: (): asdf => 0,
b: (): asdf => 0,
c: (): asdf => 0,
}
END
! call assert_equal(expected, getline(1, 6))

" insert on the next column should do exactly the same
:%dele
call setline(1, lines)
! exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>"
! call assert_equal(expected, getline(1, 6))

filetype off
bwipe!
*** ../vim-9.0.0611/src/version.c 2022-09-27 19:34:30.662212363 +0100
--- src/version.c 2022-09-27 22:16:56.612769114 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 612,
/**/

--
hundred-and-one symptoms of being an internet addict:
202. You're amazed to find out Spam is a food.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///