Merge pull request #23464 from zeertzjq/vim-9.0.0609

vim-patch:9.0.{0609,0612}
This commit is contained in:
zeertzjq 2023-05-04 13:09:43 +08:00 committed by GitHub
commit a1bd31e601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,6 +18,7 @@ endfunc
func Test_blockinsert_autoindent() func Test_blockinsert_autoindent()
new new
let lines =<< trim END let lines =<< trim END
vim9script
var d = { var d = {
a: () => 0, a: () => 0,
b: () => 0, b: () => 0,
@ -28,40 +29,42 @@ func Test_blockinsert_autoindent()
filetype plugin indent on filetype plugin indent on
setlocal sw=2 et ft=vim setlocal sw=2 et ft=vim
setlocal indentkeys+=: setlocal indentkeys+=:
exe "norm! 2Gf)\<c-v>2jA: asdf\<esc>" exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
let expected =<< trim END let expected =<< trim END
vim9script
var d = { var d = {
a: (): asdf => 0, a: (): asdf => 0,
b: (): asdf => 0, b: (): asdf => 0,
c: (): asdf => 0, c: (): asdf => 0,
} }
END 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 " insert on the next column should do exactly the same
:%dele :%dele
call setline(1, lines) call setline(1, lines)
exe "norm! 2Gf)l\<c-v>2jI: asdf\<esc>" exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>"
call assert_equal(expected, getline(1, 5)) call assert_equal(expected, getline(1, 6))
:%dele :%dele
call setline(1, lines) call setline(1, lines)
setlocal sw=8 noet setlocal sw=8 noet
exe "norm! 2Gf)\<c-v>2jA: asdf\<esc>" exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
let expected =<< trim END let expected =<< trim END
vim9script
var d = { var d = {
a: (): asdf => 0, a: (): asdf => 0,
b: (): asdf => 0, b: (): asdf => 0,
c: (): asdf => 0, c: (): asdf => 0,
} }
END 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 " insert on the next column should do exactly the same
:%dele :%dele
call setline(1, lines) call setline(1, lines)
exe "norm! 2Gf)l\<c-v>2jI: asdf\<esc>" exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>"
call assert_equal(expected, getline(1, 5)) call assert_equal(expected, getline(1, 6))
filetype off filetype off
bwipe! bwipe!