Reorg and consolidate codebase, move completion logic from copilot.lua into copilot_cmp

Author: zbirenbaum

lua/copilot/client.lua

@@ -13,6 +13,7 @@ M.buf_attach_copilot = function()
   local client = vim.lsp.get_active_clients({name=name})[1]
   if client and not vim.lsp.buf_is_attached(0, client.id) then
     vim.lsp.buf_attach_client(0, client.id)
+    client.completion_function = M.params.extensions
   end
 end
 
@@ -25,7 +26,6 @@ M.merge_server_opts = function (params)
     on_init = function(_, _)
       vim.schedule(M.buf_attach_copilot)
       vim.schedule(register_autocmd)
-      params.extensions[params.cmp.method](params.cmp.max_results)
     end,
     settings = params.settings,
   }, params.server_opts_overrides or {})

lua/copilot/extensions/panel.lua

@@ -1,70 +1,29 @@
 local util = require("copilot.util")
-local format = require("copilot_cmp.format")
-local handler = require("copilot.handlers")
-local print_buf = require("copilot.extensions.print_panel")
 
 local panel = {
-  method = "getPanelCompletions",
   usecmp = false,
-  client = vim.lsp.get_active_clients({name="copilot"})[1],
+  client = {},
   buf = "",
   uri = "copilot:///placeholder",
   requests = {},
 }
 
-panel.send_request = function (callback)
-  panel.client = not vim.tbl_isempty(panel.client) and panel.client or vim.lsp.get_active_clients({name="copilot"})[1]
+panel.send_request = function (opts)
+  local client = opts.client or not vim.tbl_isempty(panel.client) and panel.client or vim.lsp.get_active_clients({name="copilot"})[1]
   if not panel.client then return end
   local completion_params = util.get_completion_params()
-  completion_params.panelId = panel.uri
-  callback = callback or function () end
-  return panel.client.rpc.request(panel.method, completion_params, callback)
+  completion_params.panelId = opts.uri or panel.uri
+  local callback = opts.callback or function () end
+  return client.rpc.request("getPanelCompletions", completion_params, callback)
 end
 
-local existing_matches= {}
-
-local verify_existing = function (context)
-  existing_matches[context.bufnr] = existing_matches[context.bufnr] or {}
-  existing_matches[context.bufnr][context.cursor.row] = existing_matches[context.bufnr][context.cursor.row] or {}
-end
-
-panel.complete = vim.schedule_wrap(function (_, params, callback)
-  local context = params.context
-  verify_existing(context)
-  local sent, id
-
-  local add_completion = function (result)
-    result.text = result.displayText
-    local formatted = format.format_item(params, result)
-    existing_matches[context.bufnr][context.cursor.row][formatted.label] = formatted
-  end
-
-  local completed = function ()
-    callback({
-      isIncomplete = false,
-      items = vim.tbl_values(existing_matches[context.bufnr][context.cursor.row])
-    })
-  end
-
-  handler.add_handler_callback("PanelSolution", "cmp", add_completion)
-  handler.add_handler_callback("PanelSolutionsDone", "cmp", completed)
-  if sent and id then panel.client.rpc.cancel_request(id) end
-  sent, id = panel.send_request()
-  callback({ isIncomplete = true })
-end)
-
-function panel.create (max_results)
+function panel.create (client, max_results)
+  panel.client = client or vim.lsp.get_active_clients({name="copilot"})[1]
+  if not client then print("Error, copilot not running") end
   panel.max_results = max_results or 10
   panel.buf = type(panel.uri) == "number" or vim.api.nvim_create_buf(false, true)
   vim.api.nvim_buf_set_name(panel.buf, "copilot:///" .. tostring(panel.buf))
   panel.uri = vim.uri_from_bufnr(panel.buf)
-  panel.client = vim.lsp.get_active_clients({name="copilot"})
-
-  vim.api.nvim_create_user_command("CopilotPanel", function ()
-    panel.send_request()
-    print_buf.create(panel.buf)
-  end, {})
-
   return panel
 end
 

lua/copilot/init.lua

@@ -3,16 +3,11 @@ local client = require("copilot.client")
 
 local defaults = {
   cmp = {
-    method = "getCompletionsCycling",
-    max_results = 5,
+    enabled = true,
+    method = "getPanelCompletions",
   },
-  extensions = {
-    getPanelCompletions = function ()
-      require("copilot_cmp").setup(require("copilot.extensions.panel").complete)
-    end,
-    getCompletionsCycling = function ()
-      require("copilot_cmp").setup()
-    end,
+  panel = { -- no config options yet
+    enabled = true,
   },
   ft_disable = {},
   plugin_manager_path = vim.fn.stdpath("data") .. "/site/pack/packer",
@@ -25,6 +20,14 @@ local defaults = {
   }
 }
 
+local create_cmds = function (_)
+  vim.api.nvim_create_user_command("CopilotPanel", function ()
+    local panel = require("copilot.extensions.panel").create()
+    panel.send_request()
+    require("copilot.extensions.print_panel").create(panel.buf)
+  end, {})
+end
+
 local config_handler = function(opts)
   local user_config = opts and vim.tbl_deep_extend("force", defaults, opts) or defaults
   return user_config
@@ -34,7 +37,15 @@ M.setup = function(opts)
   local user_config = config_handler(opts)
   vim.schedule(function ()
     client.start(user_config)
-    require("copilot.extensions.panel").create()
+
+    if user_config.cmp.enabled then
+      require("copilot_cmp").setup(user_config.cmp.method)
+    end
+
+    if user_config.panel.enabled then
+      create_cmds(user_config)
+    end
+
   end)
 end