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

1 files changed, 19 insertions, 22 deletions

diff --git a/test/functional/legacy/highlight_spec.lua b/test/functional/legacy/highlight_spec.lua
index 3d06bf3978..35afd9bb4a 100644
--- a/test/functional/legacy/highlight_spec.lua
+++ b/test/functional/legacy/highlight_spec.lua
@@ -1,12 +1,14 @@
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local helpers = require('test.functional.helpers')(after_each)
-local clear, feed = helpers.clear, helpers.feed
-local expect = helpers.expect
-local eq = helpers.eq
-local poke_eventloop = helpers.poke_eventloop
-local exc_exec = helpers.exc_exec
-local feed_command = helpers.feed_command
-local exec = helpers.exec
+
+local clear, feed = n.clear, n.feed
+local expect = n.expect
+local eq = t.eq
+local poke_eventloop = n.poke_eventloop
+local exc_exec = n.exc_exec
+local feed_command = n.feed_command
+local exec = n.exec
 
 before_each(clear)
 
@@ -22,15 +24,15 @@ describe(':highlight', function()
     -- is discarded resulting in test failure
     screen:expect([[
       :highlight                         |
-      SpecialKey     xxx ctermfg=4       |
-                         guifg=Blue      |
-      EndOfBuffer    xxx links to NonText|
+      SpecialKey     {18:xxx} {18:ctermfg=}4       |
+                         {18:guifg=}Blue      |
+      EndOfBuffer    {1:xxx} {18:links to} NonText|
                                          |
-      TermCursor     xxx cterm=reverse   |
-                         gui=reverse     |
+      TermCursor     {2:xxx} {18:cterm=}reverse   |
+                         {18:gui=}reverse     |
       TermCursorNC   xxx cleared         |
-      NonText        xxx ctermfg=12      |
-      -- More --^                         |
+      NonText        {1:xxx} {18:ctermfg=}12      |
+      {6:-- More --}^                         |
     ]])
     feed('q')
     poke_eventloop() -- wait until we're back to normal
@@ -99,11 +101,6 @@ describe('Visual selection highlight', function()
   -- oldtest: Test_visual_sbr()
   it("when 'showbreak' is set", function()
     local screen = Screen.new(60, 6)
-    screen:set_default_attr_ids({
-      [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
-      [2] = { bold = true }, -- ModeMsg
-    })
     screen:attach()
     exec([[
       set showbreak=>
@@ -112,9 +109,9 @@ describe('Visual selection highlight', function()
     ]])
     feed('v$')
     screen:expect([[
-      {0:>}{1:n, no sea takimata sanctus est Lorem ipsum dolor sit amet.}^ |
+      {1:>}{17:n, no sea takimata sanctus est Lorem ipsum dolor sit amet.}^ |
                                                                   |*4
-      {2:-- VISUAL --}                                                |
+      {5:-- VISUAL --}                                                |
     ]])
   end)
 end)