From d33e1da9b7f7e886219cfdd20b9bbfaccdc43be9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 12 Jan 2024 11:28:20 +0000
Subject: test: do not inject vim module into global helpers

---
 test/functional/legacy/cmdline_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/functional/legacy/cmdline_spec.lua')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 99731bb80b..8e2ef2aabd 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -6,7 +6,7 @@ local feed = helpers.feed
 local feed_command = helpers.feed_command
 local exec = helpers.exec
 local meths = helpers.meths
-local pesc = helpers.pesc
+local pesc = vim.pesc
 
 describe('cmdline', function()
   before_each(clear)
-- 
cgit 


From c30f2e3182e3b50e7c03932027ac55edfc8ada4a Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 12 Jan 2024 12:44:54 +0000
Subject: test: typing for helpers.meths

---
 test/functional/legacy/cmdline_spec.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/functional/legacy/cmdline_spec.lua')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index 8e2ef2aabd..ea6d8409ba 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -198,9 +198,9 @@ describe('cmdline', function()
       [3] = { reverse = true }, -- TabLineFill
     })
     screen:attach()
-    meths.set_option_value('laststatus', 2, {})
-    meths.set_option_value('showtabline', 2, {})
-    meths.set_option_value('cmdheight', 1, {})
+    meths.nvim_set_option_value('laststatus', 2, {})
+    meths.nvim_set_option_value('showtabline', 2, {})
+    meths.nvim_set_option_value('cmdheight', 1, {})
     screen:expect([[
       {2: [No Name] }{3:                                                 }|
       ^                                                            |
@@ -217,10 +217,10 @@ describe('cmdline', function()
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
     }
     screen:attach()
-    meths.set_option_value('ruler', true, {})
-    meths.set_option_value('rulerformat', 'longish', {})
-    meths.set_option_value('laststatus', 0, {})
-    meths.set_option_value('winwidth', 1, {})
+    meths.nvim_set_option_value('ruler', true, {})
+    meths.nvim_set_option_value('rulerformat', 'longish', {})
+    meths.nvim_set_option_value('laststatus', 0, {})
+    meths.nvim_set_option_value('winwidth', 1, {})
     feed [[<C-W>v<C-W>|<C-W>p]]
     screen:expect [[
                         │^ |
-- 
cgit 


From 795f896a5772d5e0795f86642bdf90c82efac45c Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 12 Jan 2024 17:59:57 +0000
Subject: test: rename (meths, funcs) -> (api, fn)

---
 test/functional/legacy/cmdline_spec.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'test/functional/legacy/cmdline_spec.lua')

diff --git a/test/functional/legacy/cmdline_spec.lua b/test/functional/legacy/cmdline_spec.lua
index ea6d8409ba..8c94451f9a 100644
--- a/test/functional/legacy/cmdline_spec.lua
+++ b/test/functional/legacy/cmdline_spec.lua
@@ -5,7 +5,7 @@ local command = helpers.command
 local feed = helpers.feed
 local feed_command = helpers.feed_command
 local exec = helpers.exec
-local meths = helpers.meths
+local api = helpers.api
 local pesc = vim.pesc
 
 describe('cmdline', function()
@@ -198,9 +198,9 @@ describe('cmdline', function()
       [3] = { reverse = true }, -- TabLineFill
     })
     screen:attach()
-    meths.nvim_set_option_value('laststatus', 2, {})
-    meths.nvim_set_option_value('showtabline', 2, {})
-    meths.nvim_set_option_value('cmdheight', 1, {})
+    api.nvim_set_option_value('laststatus', 2, {})
+    api.nvim_set_option_value('showtabline', 2, {})
+    api.nvim_set_option_value('cmdheight', 1, {})
     screen:expect([[
       {2: [No Name] }{3:                                                 }|
       ^                                                            |
@@ -217,10 +217,10 @@ describe('cmdline', function()
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
     }
     screen:attach()
-    meths.nvim_set_option_value('ruler', true, {})
-    meths.nvim_set_option_value('rulerformat', 'longish', {})
-    meths.nvim_set_option_value('laststatus', 0, {})
-    meths.nvim_set_option_value('winwidth', 1, {})
+    api.nvim_set_option_value('ruler', true, {})
+    api.nvim_set_option_value('rulerformat', 'longish', {})
+    api.nvim_set_option_value('laststatus', 0, {})
+    api.nvim_set_option_value('winwidth', 1, {})
     feed [[<C-W>v<C-W>|<C-W>p]]
     screen:expect [[
                         │^ |
-- 
cgit