refactor: use CompletionItem.command

Author: sudo-tee

README.md

@@ -236,8 +236,6 @@ require('opencode').setup({
       snacks_layout = nil -- `layout` opts to pass to Snacks.picker.pick({ layout = ... })
     },
     completion = {
-      supports_kind_icons = false, -- set to true if your completion engine supports kind icons (blink does) it will show icons with proper highlight instead of a generic kind icon
-      use_native_completion = false, -- Set to true if you use native nvim completion otherwise it might not auto trigger in the input window.
       file_sources = {
         enabled = true,
         preferred_cli_tool = 'server', -- 'fd','fdfind','rg','git','server' if nil, it will use the best available tool, 'server' uses opencode cli to get file list (works cross platform) and supports folders

ftplugin/opencode.lua

@@ -10,44 +10,9 @@ local bufnr = vim.api.nvim_get_current_buf()
 local opencode_ls = require('opencode.lsp.opencode_ls')
 local client_id = opencode_ls.start(bufnr)
 local completion = require('opencode.ui.completion')
-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
-        vim.lsp.completion.enable(true, client_id, bufnr, { autotrigger = true })
-      end
-      completion.on_insert_enter()
-    end,
-  })
-
-  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,
-  })
+if client_id and not completion.has_completion_engine() then
+  pcall(function()
+    vim.bo.completeopt = 'menu,menuone,noselect,fuzzy'
+    vim.lsp.completion.enable(true, client_id, bufnr, { autotrigger = true })
+  end)
 end

lua/opencode/config.lua

@@ -149,8 +149,6 @@ M.defaults = {
       snacks_layout = nil,
     },
     completion = {
-      supports_kind_icons = false,
-      use_native_completion = false,
       file_sources = {
         enabled = true,
         preferred_cli_tool = 'server',
@@ -286,18 +284,11 @@ function M.setup(opts)
 
   update_keymap_prefix(M.values.keymap_prefix, M.defaults.keymap_prefix)
 
-  -- Legacy completion settings handling
   if opts.preferred_completion then
     vim.notify(
-      '[opencode.nvim] "preferred_completion" is deprecated. Please configure completion "ui.completion" table.',
+      '[opencode.nvim] "preferred_completion" is deprecated and has no effect. Please remove it from your config.',
       vim.log.levels.WARN
     )
-    if opts.preferred_completion == 'vim_complete' then
-      M.values.ui.completion.use_native_completion = true
-    end
-    if opts.preferred_completion == 'blink' then
-      M.values.ui.completion.supports_kind_icons = true
-    end
   end
 end
 

lua/opencode/keymap.lua

@@ -1,8 +1,7 @@
 local M = {}
 
 local function is_completion_visible()
-  local ok, completion = pcall(require, 'opencode.ui.completion')
-  return ok and completion.is_visible()
+  return require('opencode.ui.completion').is_completion_visible()
 end
 
 local function wrap_with_completion_check(key_binding, callback)

lua/opencode/lsp/opencode_ls.lua

@@ -1,4 +1,3 @@
-local config = require('opencode.config')
 ---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.)
@@ -21,6 +20,9 @@ handlers[ms.initialize] = function(params, callback)
         resolveProvider = false,
         triggerCharacters = triggers,
       },
+      executeCommandProvider = {
+        commands = { 'opencode.completion_done' },
+      },
     },
     serverInfo = {
       name = 'opencode_ls',
@@ -29,6 +31,21 @@ handlers[ms.initialize] = function(params, callback)
   })
 end
 
+handlers[ms.workspace_executeCommand] = function(params, callback)
+  if params.command == 'opencode.completion_done' then
+    local item = params.arguments and params.arguments[1]
+    if item then
+      require('opencode.ui.completion').on_completion_done(item)
+    end
+    callback(nil, nil)
+  else
+    callback({
+      code = -32601,
+      message = 'Method not found: ' .. tostring(params.command),
+    }, nil)
+  end
+end
+
 ---Get word to complete from cursor position
 ---@param params lsp.CompletionParams
 ---@return string word_to_complete
@@ -63,18 +80,21 @@ local function get_completion_context(params)
 end
 
 function M.supports_kind_icons()
-  return config.ui.completion.supports_kind_icons
+  return require('opencode.ui.completion').supports_kind_icons()
 end
 
 ---Convert opencode CompletionItem to LSP CompletionItem
 ---@param item CompletionItem
 ---@param index integer
----@return lsp.CompletionItem
+---@return OpencodeLspItem
 local function to_lsp_item(item, index)
   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
+  ---@type OpencodeLspItem
   local lsp_item = {
     label = (M.supports_kind_icons() and '' or item.kind_icon .. ' ') .. item.label,
-    kind = source.custom_kind or vim.lsp.protocol.CompletionItemKind.Function,
+    kind = kind,
     kind_hl = item.kind_hl,
     kind_icon = M.supports_kind_icons() and item.kind_icon or '',
     detail = item.detail,
@@ -85,7 +105,12 @@ local function to_lsp_item(item, index)
     insertText = item.insert_text or item.label,
     insertTextFormat = vim.lsp.protocol.InsertTextFormat.PlainText,
     filterText = item.label,
-    sortText = string.format('%02d_%02d_%02d_%s', source.priority or 999, item.priority or 999, index, item.label),
+    sortText = string.format('%02d_%02d_%02d_%s', priority, item.priority or 999, index, item.label),
+    command = {
+      title = 'opencode.completion_done',
+      command = 'opencode.completion_done',
+      arguments = { item },
+    },
     data = {
       source_name = item.source_name,
       original_data = item.data,
@@ -103,10 +128,12 @@ handlers[ms.textDocument_completion] = function(params, callback)
   local word, trigger_char, line = get_completion_context(params)
 
   -- Build completion context
+  ---@type CompletionContext
   local completion_context = {
     input = word,
     trigger_char = trigger_char,
     line = line,
+    cursor_pos = params.position.character,
   }
 
   local completion = require('opencode.ui.completion')
@@ -121,6 +148,7 @@ handlers[ms.textDocument_completion] = function(params, callback)
 
   Promise.all(promises)
     :and_then(function(results)
+      ---@type OpencodeLspItem[]
       local all_items = {}
       local is_incomplete = false
 
@@ -136,7 +164,6 @@ handlers[ms.textDocument_completion] = function(params, callback)
       end
 
       callback(nil, { isIncomplete = is_incomplete, items = all_items })
-      completion.store_completion_items(all_items)
     end)
     :catch(function(err)
       local log = require('opencode.log')

lua/opencode/types.lua

@@ -107,8 +107,6 @@
 
 ---@class OpencodeCompletionConfig
 ---@field file_sources OpencodeCompletionFileSourcesConfig
----@field supports_kind_icons boolean
----@field use_native_completion boolean
 
 ---@class OpencodeLoadingAnimationConfig
 ---@field frames string[]
@@ -416,6 +414,12 @@
 ---@field get_trigger_character? fun(): string|nil Optional function returning the trigger character for this source
 ---@field custom_kind? integer Custom LSP CompletionItemKind registered for this source
 
+---Extended LSP completion item with opencode-specific rendering fields
+---@class OpencodeLspItem : lsp.CompletionItem
+---@field kind lsp.CompletionItemKind
+---@field kind_hl? string Highlight group for the kind icon
+---@field kind_icon string Icon string for the kind
+
 ---@class OpencodeContext
 ---@field current_file OpencodeContextFile|nil
 ---@field cursor_data OpencodeContextCursorData|nil