add support for post-completion format execution

Author: zbirenbaum

lua/copilot_cmp/format.lua

@@ -1,5 +1,6 @@
 local formatter= {}
 
+local close_chars = { [')'] = true, [']'] = true, ['}'] = true }
 local shorten = function (str)
   local short_prefix = string.sub(str, 0, 20)
   local short_suffix = string.sub(str, string.len(str)-15, string.len(str))
@@ -44,14 +45,25 @@ local check_exists = function (text_list)
 end
 
 local format_insert_text = function (deindented, ctx)
+  -- if ctx.cursor_after_line[1]
+
   local indent_string = get_indent_string(ctx)
+
   local text_list = str_to_list(deindented)
+
+  --do this before check_exists so that we end after existing
+  local fmt_info = {
+    startl = ctx.cursor.row,
+    endl = #text_list + ctx.cursor.row - 1,
+    n_lines = #text_list,
+  }
   -- this is necessary because first line starts at cursor pos
   for line_idx = 2, #text_list do
     text_list[line_idx] = indent_string .. text_list[line_idx]
   end
   text_list = check_exists(text_list)
-  return table.concat(text_list, '\n')
+  local fmt_string = table.concat(text_list, '\n')
+  return fmt_string, fmt_info
 end
 
 local format_label_text = function (item)
@@ -61,12 +73,18 @@ local format_label_text = function (item)
 end
 
 local format_item = function(item, params)
+  -- local after_without_ws = params.context.cursor_after_line:match("^%s*(.-)%s*$")
+  -- if #after_without_ws > 0 and close_chars[after_without_ws] then
+  --   item.text = item.text .. after_without_ws .. '\n'
+  -- end
   local deindented = formatter.deindent(item.text)
-  local insert_text = format_insert_text(deindented, params.context)
+  local insert_text, fmt_info = format_insert_text(deindented, params.context)
   local label_text = format_label_text(item)
+
   return {
     copilot = true, -- for comparator, only availiable in panel, not cycling
     score = item.score or nil,
+    fmt_info = fmt_info,
     label = label_text,
     filterText = label_text:sub(0, label_text:len()-1),
     kind = 1,

lua/copilot_cmp/init.lua

@@ -39,20 +39,19 @@ local find_buf_client = function()
   end
 end
 
-M.setup = function(completion_method)
+M.setup = function(opts)
   M._on_insert_enter = function()
     local cmp = require("cmp")
     local copilot = find_buf_client()
     if copilot and not M.client_source_map[copilot.id] then
-      local s = source.new(copilot, completion_method)
+      local s = source.new(copilot, opts)
       if s:is_available() then
         M.client_source_map[copilot.id] = cmp.register_source("copilot", s)
       end
     end
   end
 
   vim.api.nvim_create_autocmd({ "InsertEnter" }, { callback = M._on_insert_enter })
-
 end
 
 return M

lua/copilot_cmp/source.lua

@@ -3,10 +3,22 @@ local source = {}
 function source:get_keyword_pattern()
   return "\\w\\+.*"
 end
+
 source.get_trigger_characters = function()
   return { "\t", "\n", ".", ":", "(", "'", '"', "[", ",", "#", "*", "@", "|", "=", "-", "{", "/", "\\", " ", "+", "?"}
 end
 
+source.autofmt = function (_, completion_item, callback)
+  vim.schedule(function ()
+    local fmt_info = completion_item.fmt_info
+    vim.api.nvim_win_set_cursor(0, {fmt_info.startl, 0})
+    vim.cmd("silent! normal " .. tostring(fmt_info.n_lines) .. "==")
+    local endl_contents = vim.api.nvim_buf_get_lines(0, fmt_info.endl-1, fmt_info.endl+1, false)[1] or ""
+    vim.api.nvim_win_set_cursor(0, {fmt_info.endl, #endl_contents})
+  end)
+  return callback()
+end
+
 source.is_available = function(self)
   -- client is stopped.
   if self.client.is_stopped() then
@@ -22,9 +34,15 @@ source.is_available = function(self)
   return true
 end
 
-source.new = function(client, completion_fn)
+source.new = function(client, opts)
+  opts = opts or {}
+  local completion_fn = opts.completion_fn
+  print(vim.inspect(opts))
+
   local completion_functions = require("copilot_cmp.completion_functions")
   local self = setmetatable({ timer = vim.loop.new_timer() }, { __index = source })
+
+  self.execute = opts.autofmt and source.autofmt or nil
   self.client = client
   self.request_ids = {}
   self.complete = completion_fn and completion_functions.init(completion_fn) or completion_functions.init("getCompletionsCycling")