fix zbirenbaum#16

Author: zbirenbaum

lua/copilot/setup.lua lua/copilot/auth.lualua/copilot/setup.lua renamed to lua/copilot/auth.lua

@@ -1,35 +1,43 @@
 local util = require("copilot.util")
-local M = {}
+local M = { params = {} }
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities.getCompletions = true
+M.buf_attach_copilot = function()
+  if vim.tbl_contains(M.params.ft_disable, vim.bo.filetype) then return end
+  if not vim.bo.buflisted or not vim.bo.buftype == "" then return end
+  local client_id = require("copilot.util").find_copilot_client()
+  local buf_clients = vim.lsp.buf_get_clients(0)
+  if client_id and buf_clients and not buf_clients[client_id] then
+    vim.lsp.buf_attach_client(0, client_id)
+  end
+end
 
-M.start = function(params)
-  vim.lsp.start_client({
+M.merge_server_opts = function (params)
+  return vim.tbl_deep_extend("force", params.server_opts_overrides, {
     cmd = { require("copilot.util").get_copilot_path(params.plugin_manager_path) },
     name = "copilot",
     trace = "messages",
     root_dir = vim.loop.cwd(),
     autostart = true,
-    on_init = function(client, _)
-      vim.lsp.buf_attach_client(0, client.id)
+    on_init = function(_, _)
+      M.buf_attach_copilot()
       if vim.fn.has("nvim-0.7") > 0 then
         vim.api.nvim_create_autocmd({ "BufEnter" }, {
-          callback = function()
-            util.attach_copilot()
-          end,
+          callback = vim.schedule(function() M.buf_attach_copilot() end),
           once = false,
         })
       else
-        vim.cmd("au BufEnter * lua require('copilot.util').attach_copilot()")
+        vim.cmd("au BufEnter * lua vim.schedule(function() require('copilot.copilot_handler').buf_attach_copilot() end)")
       end
     end,
     on_attach = function()
-      vim.schedule(function()
-        params.on_attach()
-      end)
+      vim.schedule_wrap(params.on_attach())
     end,
   })
 end
 
+M.start = function(params)
+  M.params = params
+  vim.lsp.start_client(M.merge_server_opts(params))
+end
+
 return M

lua/copilot/copilot_handler.lua

@@ -5,6 +5,13 @@ local defaults = {
   on_attach = function()
     require("copilot_cmp")._on_insert_enter()
   end,
+  startup_function = function()
+    vim.defer_fn(function()
+      require("copilot_cmp")._on_insert_enter()
+    end, 100)
+  end,
+  server_opts_overrides = {},
+  ft_disable = {},
 }
 
 local config_handler = function(opts)

lua/copilot/init.lua

@@ -1,6 +1,5 @@
 local M = {}
 
-
 local format_pos = function()
   local pos = vim.api.nvim_win_get_cursor(0)
   return { character = pos[2], line = pos[1] - 1 }
@@ -27,13 +26,6 @@ M.find_copilot_buf_client = function()
   end
 end
 
-M.attach_copilot = function()
-  local client_id = require("copilot.util").find_copilot_client()
-  if client_id and not vim.lsp.buf_get_clients(0)[client_id] then
-    vim.lsp.buf_attach_client(0, client_id)
-  end
-end
-
 M.get_completion_params = function()
   local params = {
     options = vim.empty_dict(),