1 files changed, 68 insertions, 9 deletions

diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim
index 1c2f5a05ff..429253a863 100644
--- a/src/nvim/testdir/test_display.vim
+++ b/src/nvim/testdir/test_display.vim
@@ -6,11 +6,12 @@
 " endif
 
 source view_util.vim
+source check.vim
+source screendump.vim
+
+func Test_display_foldcolumn()
+  CheckFeature folding
 
-func! Test_display_foldcolumn()
-  if !has("folding")
-    return
-  endif
   new
   vnew
   vert resize 25
@@ -26,10 +27,10 @@ func! Test_display_foldcolumn()
 
   call cursor(2, 1)
   norm! zt
-  let lines=ScreenLines([1,2], winwidth(0))
+  let lines = ScreenLines([1,2], winwidth(0))
   call assert_equal(expect, lines)
   set fdc=2
-  let lines=ScreenLines([1,2], winwidth(0))
+  let lines = ScreenLines([1,2], winwidth(0))
   let expect = [
         \ "  e more noise blah blah<",
         \ "  82> more stuff here    "
@@ -41,9 +42,8 @@ func! Test_display_foldcolumn()
 endfunc
 
 func! Test_display_foldtext_mbyte()
-  if !has("folding")
-    return
-  endif
+  CheckFeature folding
+
   call NewWindow(10, 40)
   call append(0, range(1,20))
   exe "set foldmethod=manual foldtext=foldtext() fillchars=fold:\u2500,vert:\u2502 fdc=2"
@@ -70,6 +70,42 @@ func! Test_display_foldtext_mbyte()
   bw!
 endfunc
 
+" check that win_ins_lines() and win_del_lines() work when t_cs is empty.
+func Test_scroll_without_region()
+  CheckScreendump
+
+  let lines =<< trim END
+    call setline(1, range(1, 20))
+    set t_cs=
+    set laststatus=2
+  END
+  call writefile(lines, 'Xtestscroll')
+  let buf = RunVimInTerminal('-S Xtestscroll', #{rows: 10})
+
+  call VerifyScreenDump(buf, 'Test_scroll_no_region_1', {})
+
+  call term_sendkeys(buf, ":3delete\<cr>")
+  call VerifyScreenDump(buf, 'Test_scroll_no_region_2', {})
+
+  call term_sendkeys(buf, ":4put\<cr>")
+  call VerifyScreenDump(buf, 'Test_scroll_no_region_3', {})
+
+  call term_sendkeys(buf, ":undo\<cr>")
+  call term_sendkeys(buf, ":undo\<cr>")
+  call term_sendkeys(buf, ":set laststatus=0\<cr>")
+  call VerifyScreenDump(buf, 'Test_scroll_no_region_4', {})
+
+  call term_sendkeys(buf, ":3delete\<cr>")
+  call VerifyScreenDump(buf, 'Test_scroll_no_region_5', {})
+
+  call term_sendkeys(buf, ":4put\<cr>")
+  call VerifyScreenDump(buf, 'Test_scroll_no_region_6', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete('Xtestscroll')
+endfunc
+
 func Test_display_listchars_precedes()
   set fillchars+=vert:\|
   call NewWindow(10, 10)
@@ -125,3 +161,26 @@ func Test_display_listchars_precedes()
   set list& listchars& wrap&
   bw!
 endfunc
+
+" Check that win_lines() works correctly with the number_only parameter=TRUE
+" should break early to optimize cost of drawing, but needs to make sure
+" that the number column is correctly highlighted.
+func Test_scroll_CursorLineNr_update()
+  CheckScreendump
+
+  let lines =<< trim END
+    hi CursorLineNr ctermfg=73 ctermbg=236
+    set nu rnu cursorline cursorlineopt=number
+    exe ":norm! o\<esc>110ia\<esc>"
+  END
+  let filename = 'Xdrawscreen'
+  call writefile(lines, filename)
+  let buf = RunVimInTerminal('-S '.filename, #{rows: 5, cols: 50})
+  call term_sendkeys(buf, "k")
+  call term_wait(buf)
+  call VerifyScreenDump(buf, 'Test_winline_rnu', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete(filename)
+endfunc