API: include invalid buffer/window/tabpage in error message (#11712)

2 files changed, 7 insertions, 3 deletions

diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index ed7ce72597..20b3163d95 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -24,6 +24,10 @@ describe('api/tabpage', function()
       nvim('set_current_win', win3)
       eq(win3, tabpage('get_win', tab2))
     end)
+
+    it('validates args', function()
+      eq('Invalid tabpage id: 23', pcall_err(tabpage, 'list_wins', 23))
+    end)
   end)
 
   describe('{get,set,del}_var', function()
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index 17e0d3235c..8c7c3208c0 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -55,8 +55,8 @@ describe('API/win', function()
     end)
 
     it('validates args', function()
-      eq('Invalid buffer id', pcall_err(window, 'set_buf', nvim('get_current_win'), 23))
-      eq('Invalid window id', pcall_err(window, 'set_buf', 23, nvim('get_current_buf')))
+      eq('Invalid buffer id: 23', pcall_err(window, 'set_buf', nvim('get_current_win'), 23))
+      eq('Invalid window id: 23', pcall_err(window, 'set_buf', 23, nvim('get_current_buf')))
     end)
   end)
 
@@ -73,7 +73,7 @@ describe('API/win', function()
 
     it('does not leak memory when using invalid window ID with invalid pos',
     function()
-      eq('Invalid window id', pcall_err(meths.win_set_cursor, 1, {"b\na"}))
+      eq('Invalid window id: 1', pcall_err(meths.win_set_cursor, 1, {"b\na"}))
     end)
 
     it('updates the screen, and also when the window is unfocused', function()