fix: accept completion once filtered

Author: sudo-tee

ftplugin/opencode.lua

@@ -2,8 +2,6 @@ if vim.b.did_ftplugin then
   return
 end
 vim.b.did_ftplugin = true
--- Auto-attach opencode LSP to opencode input buffers
-
 -- This provides completion for files, subagents, commands, and context items
 -- Works with any LSP-compatible completion plugin (blink.cmp, nvim-cmp, etc.)
 
@@ -16,8 +14,10 @@ local config = require('opencode.config')
 local use_native_completion = config.ui.completion.use_native_completion
 
 if client_id then
+  local augroup = vim.api.nvim_create_augroup('OpencodeLSP', { clear = true })
   -- track insert start state
   vim.api.nvim_create_autocmd('InsertEnter', {
+    group = augroup,
     buffer = bufnr,
     callback = function()
       if use_native_completion then
@@ -28,9 +28,26 @@ if client_id then
   })
 
   vim.api.nvim_create_autocmd('TextChangedI', {
+    group = augroup,
     buffer = bufnr,
     callback = function(e)
       completion.on_text_changed()
     end,
   })
+
+  vim.api.nvim_create_autocmd('InsertLeave', {
+    group = augroup,
+    buffer = bufnr,
+    callback = function()
+      completion.clear_pending()
+    end,
+  })
+
+  vim.api.nvim_create_autocmd({ 'CompleteDone' }, {
+    group = augroup,
+    buffer = bufnr,
+    callback = function(e)
+      completion.on_complete_done_event()
+    end,
+  })
 end

lua/opencode/ui/completion.lua

@@ -3,7 +3,9 @@ local M = {
   _sources = {},
   _last_line = '',
   _last_col = 0,
+  _trigger_col = 0,
   _pending = {},
+  _done_by_event = false,
 }
 
 function M.setup()
@@ -42,11 +44,15 @@ function M.on_text_changed()
     return
   end
 
+  if M._done_by_event then
+    M._done_by_event = false
+    return
+  end
+
   local line = vim.api.nvim_get_current_line()
   local col = vim.api.nvim_win_get_cursor(0)[2]
 
-  -- detect inserted text
-  local inserted = line:sub(M._last_col + 1, col)
+  local inserted = line:sub(M._trigger_col + 1, col)
 
   if M._pending[inserted] then
     local item = M._pending[inserted]
@@ -62,9 +68,15 @@ function M.on_text_changed()
 end
 
 function M.store_completion_items(items)
-  M._pending = {}
+  local col = vim.api.nvim_win_get_cursor(0)[2]
+
+  if not next(M._pending) then
+    M._trigger_col = col
+  end
+
   M._last_line = vim.api.nvim_get_current_line()
-  M._last_col = vim.api.nvim_win_get_cursor(0)[2]
+  M._last_col = col
+  M._pending = {}
 
   for _, item in ipairs(items or {}) do
     local word = item.insertText
@@ -94,6 +106,52 @@ function M.get_source_by_name(name)
   return nil
 end
 
+---Handle the CompleteDone autocmd event.
+---This is the primary completion-done path and works regardless of whether the
+---completion list was filtered. vim.v.completed_item.word is the text that was
+---actually inserted, so we look it up directly in _pending.
+function M.on_complete_done_event()
+  if not next(M._pending) then
+    return
+  end
+
+  local completed = vim.v.completed_item
+  if not completed or completed.word == nil or completed.word == '' then
+    M.clear_pending()
+    return
+  end
+
+  -- completed_item.word is the raw inserted word.  The full insertText we
+  -- stored as the key may include more (e.g. the trigger char + word), so
+  -- try both the word alone and with a leading trigger character.
+  local function try(key)
+    local lsp_item = M._pending[key]
+    if lsp_item and lsp_item.data and lsp_item.data._opencode_item then
+      M._done_by_event = true
+      M._pending = {}
+      M.on_completion_done(lsp_item.data._opencode_item)
+      return true
+    end
+    return false
+  end
+
+  if not try(completed.word) then
+    -- Some completion plugins strip the trigger char from the inserted text
+    -- but store it in user_data.  Try reconstructing the full insertText by
+    -- scanning _pending keys that end with completed.word.
+    for key, lsp_item in pairs(M._pending) do
+      if key:sub(-#completed.word) == completed.word then
+        if lsp_item.data and lsp_item.data._opencode_item then
+          M._done_by_event = true
+          M._pending = {}
+          M.on_completion_done(lsp_item.data._opencode_item)
+          break
+        end
+      end
+    end
+  end
+end
+
 ---Call the on_completion_done method for a completion item
 ---@param item CompletionItem
 function M.on_completion_done(item)
@@ -108,10 +166,20 @@ function M.on_completion_done(item)
       break
     end
   end
+  M.clear_pending()
 end
 
 function M.is_visible()
-  return M._pending and next(M._pending) ~= nil
+  if not M._pending or not next(M._pending) then
+    return false
+  end
+  return true
+end
+
+function M.clear_pending()
+  M._pending = {}
+  M._done_by_event = false
+  M._trigger_col = 0
 end
 
 return M