panel completions for cmp working

Author: zbirenbaum

lua/copilot/api.lua

@@ -32,13 +32,10 @@ M.merge_server_opts = function (params)
       vim.schedule(M.buf_attach_copilot)
       vim.schedule(register_autocmd)
     end,
-    handlers = params.panel and {
-      ["PanelSolution"] = params.panel.save_completions,
-    },
     settings = {
       advanced = {
         listCount = 10, -- #completions for panel
-        inlineSuggestCount = 1, -- #completions for getCompletions
+        inlineSuggestCount = 3, -- #completions for getCompletions
       }
     },
   }, params.server_opts_overrides or {})

lua/copilot/client.lua

@@ -0,0 +1,14 @@
+local oldprint = print
+local print = function (x) oldprint(vim.inspect(x)) end
+
+local lsp_handlers = {
+  ["PanelSolution"] = function (_, result, _, config)
+    config.callback(result)
+  end,
+
+  ["PanelSolutionsDone"] = function (err, result, ctx, config)
+    config.callback()
+  end
+}
+
+return lsp_handlers

lua/copilot/handlers.lua

@@ -30,7 +30,9 @@ M.setup = function(opts)
   local user_config = config_handler(opts)
   vim.schedule(function () client.start(user_config) end)
   if user_config.cmp_method == "getPanelCompletions" then
-    require("copilot.api").panel.create()
+    local panel = require("copilot.panel").create()
+    print(vim.inspect(panel))
+    require("copilot_cmp").setup(panel.complete)
   elseif user_config.cmp_method == "getCompletionsCycling" then
     require("copilot_cmp").setup()
   end

lua/copilot/init.lua

@@ -1,52 +1,60 @@
-local source = require("copilot_cmp.source")
+local util = require("copilot.util")
+
 local panel = {
   n_results = 5,
-  ready = {}
+  method = "getPanelCompletions",
+  usecmp = false,
+  buf = "",
+  uri = "",
 }
 
-local util = require("copilot.util")
-local completions = require("copilot_cmp")
-
-local results_callback = function (err, result)
-  panel.n_results = result.solutionCountTarget
-end
-
-local notify_callback = function (err, result)
-end
+local completions = {}
 
-panel.save_completions = function (_, solution)
-  if solution then
-    local found = false
-    for i, item in ipairs(panel.results) do
-      if item.displayText == solution.displayText then
-        panel.results[i] = not found and solution or nil
-        found = true
-      end
+panel.complete = vim.schedule_wrap(function (_, params, callback)
+  local add_completion = function (result)
+    local format = require("copilot_cmp.format").format_item
+    if result then
+      result.text = result.displayText
+      local formatted = format(params, result)
+      completions[formatted.label] = formatted
+      vim.schedule(function() callback({
+        isIncomplete = true,
+        items = vim.tbl_values(completions)
+      }) end)
     end
-    if not found then table.insert(panel.results, solution) end
   end
-end
 
-function panel.init (client_info)
-  panel.client_id = client_info.client_id or util.find_copilot_client()
-  panel.client = client_info and client_info.client
-  panel.results = {}
-  panel.cur_req = nil
-  panel.method = "getPanelCompletions"
-  panel.__index = function (i) return panel.results[i] end
-  source.complete = function (_, params, callback)
-    vim.lsp.buf_request(0, panel.method, util.get_completion_params(panel.method), function(err, result)
-      if result then
-        if panel.results and #panel.results >= 0 then
-          local entries = source.format_completions(_, params, panel.results)
-          callback(entries)
-          panel.results = {}
-        else
-          callback({ isIncomplete = true })
-        end
-      end
+  local completed = function ()
+    vim.schedule(function()
+      vim.schedule(function() callback({
+        isIncomplete = false,
+        items = vim.tbl_values(completions)
+      }) end)
+      completions = { isIncomplete = true, items = {} }
     end)
   end
+
+  local completion_params = util.get_completion_params(panel.method)
+  completion_params.panelId = panel.uri
+  vim.lsp.buf_request(0, panel.method, completion_params, function () end)
+
+  local handlers = require("copilot.handlers")
+
+  vim.lsp.handlers["PanelSolution"] = vim.lsp.with(handlers["PanelSolution"], {
+    callback = add_completion
+  })
+  vim.lsp.handlers["PanelSolutionDone"] = vim.lsp.with(handlers["PanelSolutionDone"], {
+    completed
+  })
+  callback({ isIncomplete = true })
+
+end)
+
+function panel.create (opts)
+  panel = vim.tbl_deep_extend("force", panel, opts or {})
+  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)
   return panel
 end
 

lua/copilot/panel.lua

@@ -41,7 +41,6 @@ M.get_completion_params = function(method)
   local uri = vim.uri_from_bufnr(0)
   local params = {
     options = vim.empty_dict(),
-    panelId = (method == "getPanelCompletions") and "fuckyou" or nil,
     doc = {
       source = table.concat(vim.api.nvim_buf_get_lines(0, 0, -1, false), "\n"),
       relativePath = rel_path,