neovim

commit 116b09ac0495f07cb42a0b034622b6122d4ea0f8
parent 3b6fb3fefd0bde9bd0700987c4db549a7f4916ec
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 27 Jun 2023 08:22:21 +0800

vim-patch:9.0.1667: regression test doesn't fail when fix is reverted

Problem:    Regression test doesn't fail when fix is reverted.
Solution:   Add "n" to 'cpoptions' instead of using :winsize. (closes vim/vim#12587,
            issue vim/vim#12528)

https://github.com/vim/vim/commit/e42989374144a63d986b878618aeac328e35ac3b

Diffstat:
M
test/functional/legacy/scroll_opt_spec.lua
 | 
47
++++++++++++++++++++++++-----------------------
M
test/old/testdir/test_scroll_opt.vim
 | 
6
++----

2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua
@@ -941,16 +941,17 @@ describe('smoothscroll', function()
 
   -- oldtest: Test_smoothscroll_zero_width_scroll_cursor_bot()
   it('does not divide by zero in zero-width window', function()
-    screen:try_resize(12, 19)
+    screen:try_resize(40, 19)
     screen:set_default_attr_ids({
       [1] = {foreground = Screen.colors.Brown};  -- LineNr
-      [2] = {bold = true, reverse = true};  -- StatusLine
-      [3] = {reverse = true};  -- StatusLineNC
+      [2] = {bold = true, foreground = Screen.colors.Blue};  -- NonText
+      [3] = {bold = true, reverse = true};  -- StatusLine
+      [4] = {reverse = true};  -- StatusLineNC
     })
     exec([[
       silent normal yy
       silent normal 19p
-      winsize 0 19
+      set cpoptions+=n
       vsplit
       vertical resize 0
       set foldcolumn=1
@@ -959,25 +960,25 @@ describe('smoothscroll', function()
       silent normal 20G
     ]])
     screen:expect([[
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1: }│          |
-      {1:^ }│          |
-      {2:< }{3:<ame] [+] }|
-                  |
+      {1: }│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:@}│                                      |
+      {2:^@}│                                      |
+      {3:< }{4:[No Name] [+]                         }|
+                                              |
     ]])
   end)
 
diff --git a/test/old/testdir/test_scroll_opt.vim b/test/old/testdir/test_scroll_opt.vim
@@ -843,7 +843,7 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot()
   let lines =<< trim END
       silent normal yy
       silent normal 19p
-      winsize 0 19
+      set cpoptions+=n
       vsplit
       vertical resize 0
       set foldcolumn=1
@@ -852,9 +852,7 @@ func Test_smoothscroll_zero_width_scroll_cursor_bot()
       silent normal 20G
   END
   call writefile(lines, 'XSmoothScrollZeroBot', 'D')
-  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19, wait_for_ruler: 0})
-  call TermWait(buf, 1000)
-
+  let buf = RunVimInTerminal('-u NONE -S XSmoothScrollZeroBot', #{rows: 19})
   call VerifyScreenDump(buf, 'Test_smoothscroll_zero_bot', {})
 
   call StopVimInTerminal(buf)