fix: improvements to the binary downloading timing

Author: AntoineGS

lua/copilot/client.lua

@@ -230,6 +230,11 @@ local function prepare_client_config(overrides)
     }
   end
 
+  if not cmd then
+    logger.error("copilot server type not supported")
+    return
+  end
+
   local capabilities = vim.lsp.protocol.make_client_capabilities() --[[@as copilot_capabilities]]
   capabilities.window.showDocument.support = true
 
@@ -348,8 +353,15 @@ function M.setup()
   local server_config = config.get("server") --[[@as copilot_config_server]]
   local node_command = config.get("copilot_node_command") --[[@as string|nil]]
   M.server = vim.tbl_deep_extend("force", M.server, server_config)
+
+  if M.server.custom_server_filepath then
+    M.server.custom_server_filepath = vim.fs.normalize(M.server.custom_server_filepath)
+  end
+
   if M.server.type == "nodejs" then
     lsp_nodesj.setup(node_command, M.server.custom_server_filepath)
+  elseif M.server.type == "binary" then
+    lsp_binary.setup(M.server.custom_server_filepath)
   end
 
   M.config = prepare_client_config(config.get("server_opts_overrides"))

lua/copilot/init.lua

@@ -42,7 +42,6 @@ M.setup = function(opts)
     create_cmds()
   end
 
-  lsp_binary.setup(conf.lsp_binary)
   require("copilot.command").enable()
   logger.setup(conf.logger)
 

lua/copilot/lsp_binary.lua

@@ -326,28 +326,27 @@ function M.get_server_path()
   return M.get_copilot_server_info().absolute_filepath
 end
 
----@param filepath string|nil
-function M.setup(filepath)
-  if not filepath then
-    return M
-  end
+---@param custom_server_path? string
+function M.setup(custom_server_path)
+  if custom_server_path then
+    if not vim.fn.filereadable(custom_server_path) then
+      logger.error("copilot-language-server not found at " .. custom_server_path)
+      return M
+    end
 
-  if not vim.fn.filereadable(filepath) then
-    logger.error("copilot-language-server not found at " .. filepath)
-    return M
-  end
+    logger.debug("using custom copilot-language-server binary:", custom_server_path)
+    M.copilot_server_info = {
+      path = "",
+      filename = "",
+      absolute_path = "",
+      absolute_filepath = custom_server_path or "",
+      extracted_filename = "",
+    }
 
-  M.copilot_server_info = {
-    path = "",
-    filename = "",
-    absolute_path = "",
-    absolute_filepath = vim.fs.normalize(filepath),
-    extracted_filename = "",
-  }
-
-  logger.debug("using custom copilot-language-server binary:", M.copilot_server_info.absolute_filepath)
+    M.initialized = true
+  end
 
-  M.initialized = true
+  M.ensure_client_is_downloaded()
 end
 
 return M