refactor: eliminate deprecated warnings (2nd try) (zbirenbaum#464)

Author: phanen

lua/copilot/api/init.lua

@@ -1,4 +1,5 @@
 local logger = require("copilot.logger")
+local utils = require("copilot.client.utils")
 ---@class CopilotApi
 local M = {
   ---@deprecated
@@ -19,11 +20,11 @@ function M.request(client, method, params, callback)
   params.bufnr = nil
 
   if callback then
-    return client.request(method, params, callback, bufnr)
+    return utils.wrap(client):request(method, params, callback, bufnr)
   end
 
   local co = coroutine.running()
-  client.request(method, params, function(err, data, ctx)
+  utils.wrap(client):request(method, params, function(err, data, ctx)
     coroutine.resume(co, err, data, ctx)
   end, bufnr)
   return coroutine.yield()
@@ -32,12 +33,7 @@ end
 ---@return boolean sent
 function M.notify(client, method, params)
   logger.trace("api notify:", method, params)
-
-  if vim.fn.has("nvim-0.11") == 1 then
-    return client:notify(method, params)
-  else
-    return client.notify(method, params)
-  end
+  return utils.wrap(client):notify(method, params)
 end
 
 ---@alias copilot_editor_info { name: string, version: string }

lua/copilot/client/utils.lua

@@ -80,4 +80,15 @@ function M.show_document(_, result)
   }
 end
 
+M.wrap = vim.fn.has("nvim-0.11") == 1 and function(client)
+  return client
+end or function(client)
+  -- stylua: ignore
+  return setmetatable({
+    notify = function(_, ...) return client.notify(...) end,
+    request = function(_, ...) return client.request(...) end,
+    cancel_request = function(_, ...) return client.cancel_request(...) end,
+  }, { __index = client })
+end
+
 return M

lua/copilot/suggestion/init.lua

@@ -5,6 +5,7 @@ local hl_group = require("copilot.highlight").group
 local util = require("copilot.util")
 local logger = require("copilot.logger")
 local suggestion_util = require("copilot.suggestion.utils")
+local utils = require("copilot.client.utils")
 
 local M = {}
 
@@ -208,12 +209,12 @@ local function cancel_inflight_requests(ctx)
 
   with_client(function(client)
     if ctx.first then
-      client.cancel_request(ctx.first)
+      utils.wrap(client):cancel_request(ctx.first)
       ctx.first = nil
       logger.trace("suggestion cancel first request")
     end
     if ctx.cycling then
-      client.cancel_request(ctx.cycling)
+      utils.wrap(client):cancel_request(ctx.cycling)
       ctx.cycling = nil
       logger.trace("suggestion cancel cycling request")
     end