changeset 30554:eaa79e688fb8 v9.0.0612

patch 9.0.0612: blockedit test passes with wrong result Commit: https://github.com/vim/vim/commit/47da934844afec7b04d94e0d1f8cf0a86e1b9bea Author: Bram Moolenaar <Bram@vim.org> Date: Tue Sep 27 22:18:13 2022 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 27 Sep 2022 23:30:06 +0200
parents 7e5ff77472b2
children 84c103e8174b
files src/testdir/test_blockedit.vim src/version.c
diffstat 2 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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)\<c-v>2jA: asdf\<esc>"
-  " FIXME: what do we really expect?
+  exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
   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\<c-v>2jI: asdf\<esc>"
-  call assert_equal(expected, getline(1, 5))
+  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! 2Gf)\<c-v>2jA: asdf\<esc>"
-  " FIXME: what do we really expect?
+  exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>"
   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\<c-v>2jI: asdf\<esc>"
-  call assert_equal(expected, getline(1, 5))
+  exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>"
+  call assert_equal(expected, getline(1, 6))
 
   filetype off
   bwipe!
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    612,
+/**/
     611,
 /**/
     610,