Revert "refactor: eliminate deprecated warnings (zbirenbaum#455)"

This reverts commit 353853c.
Fixes zbirenbaum#462

Author: AntoineGS

lua/copilot/api/init.lua

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

lua/copilot/client/config.lua

@@ -96,7 +96,6 @@ function M.prepare_client_config(overrides, client)
       return require("copilot.client.filetypes").language_for_file_type(filetype)
     end,
     on_init = function(lsp_client, initialize_result)
-      lsp_client = utils.wrap_client(lsp_client)
       if client.id == lsp_client.id then
         client.capabilities = initialize_result.capabilities
       end

lua/copilot/client/init.lua

@@ -25,7 +25,7 @@ local M = {
 ---@param id integer
 local function store_client_id(id)
   if M.id and M.id ~= id then
-    if M.get() then
+    if vim.lsp.get_client_by_id(M.id) then
       vim.lsp.stop_client(M.id)
     end
   end
@@ -86,7 +86,7 @@ end
 
 ---@return vim.lsp.Client|nil
 function M.get()
-  return utils.wrap_client(vim.lsp.get_client_by_id(M.id))
+  return vim.lsp.get_client_by_id(M.id)
 end
 
 function M.is_disabled()

lua/copilot/client/utils.lua

@@ -80,16 +80,4 @@ function M.show_document(_, result)
   }
 end
 
-M.wrap_client = function(client)
-  if vim.fn.has("nvim-0.11") == 1 then
-    return client
-  end
-  -- 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

@@ -186,12 +186,12 @@ local function cancel_inflight_requests(ctx)
 
   with_client(function(client)
     if ctx.first then
-      client:cancel_request(ctx.first)
+      client.cancel_request(ctx.first)
       ctx.first = nil
       logger.trace("suggestion cancel first request")
     end
     if ctx.cycling then
-      client:cancel_request(ctx.cycling)
+      client.cancel_request(ctx.cycling)
       ctx.cycling = nil
       logger.trace("suggestion cancel cycling request")
     end