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

1 files changed, 13 insertions, 15 deletions

diff --git a/test/functional/legacy/debugger_spec.lua b/test/functional/legacy/debugger_spec.lua
index 7ed5e84da6..c6f552ab51 100644
--- a/test/functional/legacy/debugger_spec.lua
+++ b/test/functional/legacy/debugger_spec.lua
@@ -1,9 +1,11 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
-local clear = helpers.clear
-local command = helpers.command
-local feed = helpers.feed
-local write_file = helpers.write_file
+
+local clear = n.clear
+local command = n.command
+local feed = n.feed
+local write_file = t.write_file
 
 before_each(clear)
 
@@ -12,10 +14,6 @@ describe('debugger', function()
 
   before_each(function()
     screen = Screen.new(999, 10)
-    screen:set_default_attr_ids({
-      [0] = { bold = true, foreground = Screen.colors.Blue },
-      [1] = { reverse = true, bold = true },
-    })
     screen:attach()
   end)
 
@@ -33,7 +31,7 @@ describe('debugger', function()
     screen:expect {
       grid = [[
       ^let g:Xtest_var += 1{MATCH: *}|
-      {0:~{MATCH: *}}|*8
+      {1:~{MATCH: *}}|*8
       :source %{MATCH: *}|
     ]],
     }
@@ -41,8 +39,8 @@ describe('debugger', function()
     screen:expect {
       grid = [[
       let g:Xtest_var += 1{MATCH: *}|
-      {0:~{MATCH: *}}|
-      {1:{MATCH: *}}|
+      {1:~{MATCH: *}}|
+      {3:{MATCH: *}}|
       Breakpoint in "{MATCH:.*}XdebugBreakExpr.vim" line 1{MATCH: *}|
       Entering Debug mode.  Type "cont" to continue.{MATCH: *}|
       Oldval = "10"{MATCH: *}|
@@ -56,7 +54,7 @@ describe('debugger', function()
     screen:expect {
       grid = [[
       ^let g:Xtest_var += 1{MATCH: *}|
-      {0:~{MATCH: *}}|*8
+      {1:~{MATCH: *}}|*8
       {MATCH: *}|
     ]],
     }
@@ -64,8 +62,8 @@ describe('debugger', function()
     screen:expect {
       grid = [[
       let g:Xtest_var += 1{MATCH: *}|
-      {0:~{MATCH: *}}|
-      {1:{MATCH: *}}|
+      {1:~{MATCH: *}}|
+      {3:{MATCH: *}}|
       Breakpoint in "{MATCH:.*}XdebugBreakExpr.vim" line 1{MATCH: *}|
       Entering Debug mode.  Type "cont" to continue.{MATCH: *}|
       Oldval = "11"{MATCH: *}|