Merge remote-tracking branch 'upstream/master' into rahm

1 files changed, 42 insertions, 2 deletions

diff --git a/test/functional/legacy/visual_mode_spec.lua b/test/functional/legacy/visual_mode_spec.lua
index c8e83ed649..8b5dd0c2dc 100644
--- a/test/functional/legacy/visual_mode_spec.lua
+++ b/test/functional/legacy/visual_mode_spec.lua
@@ -1,5 +1,3 @@
--- Test visual line mode selection redraw after scrolling
-
 local helpers = require('test.functional.helpers')(after_each)
 
 local Screen = require('test.functional.ui.screen')
@@ -10,6 +8,7 @@ local feed_command = helpers.feed_command
 local funcs = helpers.funcs
 local meths = helpers.meths
 local eq = helpers.eq
+local exec = helpers.exec
 
 describe('visual line mode', function()
   local screen
@@ -40,3 +39,44 @@ describe('visual line mode', function()
     ]])
   end)
 end)
+
+describe('visual block mode', function()
+  it('shows selection correctly with virtualedit=block', function()
+    clear()
+    local screen = Screen.new(30, 7)
+    screen:set_default_attr_ids({
+      [1] = {bold = true},  -- ModeMsg
+      [2] = {background = Screen.colors.LightGrey},  -- Visual
+      [3] = {foreground = Screen.colors.Blue, bold = true}  -- NonText
+    })
+    screen:attach()
+
+    exec([[
+      call setline(1, ['aaaaaa', 'bbbb', 'cc'])
+      set virtualedit=block
+      normal G
+    ]])
+
+    feed('<C-V>gg$')
+    screen:expect([[
+      {2:aaaaaa}^                        |
+      {2:bbbb   }                       |
+      {2:cc     }                       |
+      {3:~                             }|
+      {3:~                             }|
+      {3:~                             }|
+      {1:-- VISUAL BLOCK --}            |
+    ]])
+
+    feed('<Esc>gg<C-V>G$')
+    screen:expect([[
+      {2:aaaaaa }                       |
+      {2:bbbb   }                       |
+      {2:cc}^ {2:    }                       |
+      {3:~                             }|
+      {3:~                             }|
+      {3:~                             }|
+      {1:-- VISUAL BLOCK --}            |
+    ]])
+  end)
+end)