From e65d0e53b1234f9173831a8a34c4e64d5542b0cb Mon Sep 17 00:00:00 2001
From: smolck <46855713+smolck@users.noreply.github.com>
Date: Wed, 3 Feb 2021 18:13:04 -0600
Subject: vim.fn: throw error when trying to use API function

---
 src/nvim/lua/vim.lua | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index dbf4f6014c..e154404836 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -253,9 +253,17 @@ end
 -- vim.fn.{func}(...)
 vim.fn = setmetatable({}, {
   __index = function(t, key)
-    local function _fn(...)
-      return vim.call(key, ...)
+    local _fn
+    if vim.api[key] ~= nil then
+      _fn = function(...)
+        error(string.format("Tried to call API function with vim.fn: use vim.api.%s() instead", key))
+      end
+    else
+      _fn = function(...)
+        return vim.call(key, ...)
+      end
     end
+
     t[key] = _fn
     return _fn
   end
-- 
cgit 


From 2d06538b5eb8513ad58a7d34eed8e38664627cd8 Mon Sep 17 00:00:00 2001
From: smolck <46855713+smolck@users.noreply.github.com>
Date: Thu, 4 Feb 2021 08:27:38 -0600
Subject: remove extra line, remove () in error

---
 src/nvim/lua/vim.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index e154404836..da6c2c4678 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -256,14 +256,13 @@ vim.fn = setmetatable({}, {
     local _fn
     if vim.api[key] ~= nil then
       _fn = function(...)
-        error(string.format("Tried to call API function with vim.fn: use vim.api.%s() instead", key))
+        error(string.format("Tried to call API function with vim.fn: use vim.api.%s instead", key))
       end
     else
       _fn = function(...)
         return vim.call(key, ...)
       end
     end
-
     t[key] = _fn
     return _fn
   end
-- 
cgit 


From 4526294848e5289a1f67cdb6c7e6fe5327f340fb Mon Sep 17 00:00:00 2001
From: smolck <46855713+smolck@users.noreply.github.com>
Date: Sat, 6 Feb 2021 11:06:33 -0600
Subject: Fix unused vararg

---
 src/nvim/lua/vim.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/lua/vim.lua b/src/nvim/lua/vim.lua
index da6c2c4678..fd53bffe94 100644
--- a/src/nvim/lua/vim.lua
+++ b/src/nvim/lua/vim.lua
@@ -255,7 +255,7 @@ vim.fn = setmetatable({}, {
   __index = function(t, key)
     local _fn
     if vim.api[key] ~= nil then
-      _fn = function(...)
+      _fn = function()
         error(string.format("Tried to call API function with vim.fn: use vim.api.%s instead", key))
       end
     else
-- 
cgit