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

1 files changed, 18 insertions, 23 deletions

diff --git a/test/functional/legacy/visual_spec.lua b/test/functional/legacy/visual_spec.lua
index 151e5874e1..ab2213b2fc 100644
--- a/test/functional/legacy/visual_spec.lua
+++ b/test/functional/legacy/visual_spec.lua
@@ -1,9 +1,9 @@
-local helpers = require('test.functional.helpers')(after_each)
-
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local clear = helpers.clear
-local feed = helpers.feed
-local exec = helpers.exec
+
+local clear = n.clear
+local feed = n.feed
+local exec = n.exec
 
 before_each(clear)
 
@@ -12,11 +12,6 @@ describe('Visual highlight', function()
 
   before_each(function()
     screen = Screen.new(50, 6)
-    screen:set_default_attr_ids({
-      [0] = { foreground = Screen.colors.Blue, bold = true }, -- NonText
-      [1] = { bold = true }, -- ModeMsg
-      [2] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
-    })
     screen:attach()
   end)
 
@@ -30,20 +25,20 @@ describe('Visual highlight', function()
 
     feed('<C-V>gg$')
     screen:expect([[
-      {2:aaaaaa}^                                            |
-      {2:bbbb   }                                           |
-      {2:cc     }                                           |
-      {0:~                                                 }|*2
-      {1:-- VISUAL BLOCK --}                                |
+      {17:aaaaaa}^                                            |
+      {17:bbbb   }                                           |
+      {17:cc     }                                           |
+      {1:~                                                 }|*2
+      {5:-- VISUAL BLOCK --}                                |
     ]])
 
     feed('<Esc>gg<C-V>G$')
     screen:expect([[
-      {2:aaaaaa }                                           |
-      {2:bbbb   }                                           |
-      {2:cc}^ {2:    }                                           |
-      {0:~                                                 }|*2
-      {1:-- VISUAL BLOCK --}                                |
+      {17:aaaaaa }                                           |
+      {17:bbbb   }                                           |
+      {17:cc}^ {17:    }                                           |
+      {1:~                                                 }|*2
+      {5:-- VISUAL BLOCK --}                                |
     ]])
   end)
 
@@ -57,9 +52,9 @@ describe('Visual highlight', function()
 
     screen:expect([[
       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa^a|
-      {0:+}{2:aaaa}aaaaaa                                       |
-      {0:~                                                 }|*3
-      {1:-- VISUAL --}                                      |
+      {1:+}{17:aaaa}aaaaaa                                       |
+      {1:~                                                 }|*3
+      {5:-- VISUAL --}                                      |
     ]])
   end)
 end)