feat: handle CompletionDonePre as well

Author: sudo-tee

lua/opencode/lsp/opencode_ls.lua

@@ -1,8 +1,8 @@
 ---In-process LSP server for opencode completion
 ---Provides completion for files, subagents, commands, and context items
 ---Works with any LSP-compatible completion plugin (blink.cmp, nvim-cmp, etc.)
+local M = { _completion_done_handled = false }
 
-local M = {}
 ---@type table<vim.lsp.protocol.Method, fun(params: table, callback:fun(err: lsp.ResponseError?, result: any))>
 local handlers = {}
 local ms = vim.lsp.protocol.Methods
@@ -33,6 +33,11 @@ end
 
 handlers[ms.workspace_executeCommand] = function(params, callback)
   if params.command == 'opencode.completion_done' then
+    if M._completion_done_handled then
+      callback(nil, nil)
+      M._completion_done_handled = false
+      return
+    end
     local item = params.arguments and params.arguments[1]
     if item then
       require('opencode.ui.completion').on_completion_done(item)
@@ -87,10 +92,13 @@ end
 ---@param item CompletionItem
 ---@param index integer
 ---@return OpencodeLspItem
-local function to_lsp_item(item, index)
+local function to_lsp_item(item, index, params)
   local source = require('opencode.ui.completion').get_source_by_name(item.source_name)
   local kind = (source and source.custom_kind) or vim.lsp.protocol.CompletionItemKind.Function ---@type lsp.CompletionItemKind
   local priority = source and source.priority or 999
+  local line = params.position.line
+  local col = params.position.character
+
   ---@type OpencodeLspItem
   local lsp_item = {
     label = (M.supports_kind_icons() and '' or item.kind_icon .. ' ') .. item.label,
@@ -102,10 +110,16 @@ local function to_lsp_item(item, index)
       kind = 'plaintext',
       value = item.documentation,
     } or nil,
-    insertText = item.insert_text or item.label,
-    insertTextFormat = vim.lsp.protocol.InsertTextFormat.PlainText,
+    insertText = item.label,
     filterText = item.label,
     sortText = string.format('%02d_%02d_%02d_%s', priority, item.priority or 999, index, item.label),
+    textEdit = {
+      range = {
+        start = { line = line, character = col },
+        ['end'] = { line = line, character = col + (item.insert_text and #item.insert_text or 0) },
+      },
+      newText = item.insert_text,
+    },
     command = {
       title = 'opencode.completion_done',
       command = 'opencode.completion_done',
@@ -159,7 +173,7 @@ handlers[ms.textDocument_completion] = function(params, callback)
             is_incomplete = true
           end
 
-          table.insert(all_items, to_lsp_item(item, i))
+          table.insert(all_items, to_lsp_item(item, i, params))
         end
       end
 
@@ -207,6 +221,27 @@ end
 ---@return integer? client_id
 function M.start(bufnr)
   local config = M.create_config()
+  local augroup = vim.api.nvim_create_augroup('OpencodeLspCompletion', { clear = true })
+
+  -- Handle completion done to trigger the action, some completion plugins do not trigger the command callback, so we use this as a fallback
+  vim.api.nvim_create_autocmd('CompleteDonePre', {
+    group = augroup,
+    buffer = bufnr,
+    callback = function()
+      M._completion_done_handled = true
+      local completed_item = vim.v.completed_item
+      if completed_item and completed_item.user_data then
+        local data = vim.tbl_get(completed_item, 'user_data', 'nvim', 'lsp', 'completion_item', 'data')
+          or vim.tbl_get(completed_item, 'user_data', 'lsp', 'item', 'data')
+
+        local item = data and data._opencode_item
+
+        if item then
+          require('opencode.ui.completion').on_completion_done(item)
+        end
+      end
+    end,
+  })
   return vim.lsp.start(config, { bufnr = bufnr, silent = false })
 end
 

lua/opencode/ui/completion/commands.lua

@@ -54,7 +54,7 @@ local command_source = {
           kind_icon = icons.get('command'),
           detail = command.description,
           documentation = command.documentation .. (command.args and '\n\n* This command takes arguments.' or ''),
-          insert_text = command.name:sub(2), -- remove the trigger char from the inserted text
+          insert_text = command.name:sub(2) .. (command.args and ' ' or ''),
           source_name = 'commands',
           data = {
             name = command.name,
@@ -76,13 +76,11 @@ local command_source = {
     if item.kind == 'commands' then
       if item.data.fn then
         if item.data.args then
-          require('opencode.ui.input_window').set_content(item.insert_text .. ' ')
-          vim.api.nvim_win_set_cursor(0, { 1, #item.insert_text + 1 })
           return
         end
         vim.defer_fn(function()
           item.data.fn()
-        end, 10) -- slight delay to allow completion menu to close, this prevent a weird bug with mini.pick where it displays an empty window with `BlinkDonotRepeatHack` text inserted
+        end, 10) -- slight delay to allow completion menu to close,
         require('opencode.ui.input_window').set_content('')
       else
         vim.notify('Command not found: ' .. item.label, vim.log.levels.ERROR)

lua/opencode/ui/completion/context.lua

@@ -29,7 +29,7 @@ local function create_context_item(name, type, available, documentation, icon, a
     kind_hl = not icon and available and 'OpencodeContextSwitchOn' or nil,
     detail = name,
     documentation = documentation or (available and name or 'Enable ' .. name .. ' for this message'),
-    insert_text = name,
+    insert_text = '',
     source_name = 'context',
     priority = priority or (available and 100 or 200),
     data = { type = type, name = name, available = available, additional_data = additional_data },

lua/opencode/ui/input_window.lua

@@ -125,6 +125,10 @@ function M.handle_submit()
     return false
   end
   ---@cast windows { input_buf: integer }
+  local completion = require('opencode.ui.completion')
+  if completion.is_completion_visible() then
+    return false
+  end
 
   local input_content = table.concat(vim.api.nvim_buf_get_lines(windows.input_buf, 0, -1, false), '\n')
   vim.api.nvim_buf_set_lines(windows.input_buf, 0, -1, false, {})