feat: implement completion through LSP

Author: sudo-tee

ftplugin/opencode.lua

@@ -9,21 +9,18 @@ vim.b.did_ftplugin = true
 
 local bufnr = vim.api.nvim_get_current_buf()
 
--- Start the in-process LSP server
-local ok_lsp, opencode_ls = pcall(require, 'opencode.lsp.opencode_ls')
-if not ok_lsp then
-  vim.notify('Failed to load opencode LSP server: ' .. tostring(opencode_ls), vim.log.levels.WARN)
-  return
-end
-
-local client_id = opencode_ls.start(bufnr)
+local opencode_completion_ls = require('opencode.lsp.opencode_completion_ls')
+local client_id = opencode_completion_ls.start(bufnr)
+local completion = require('opencode.ui.completion')
 
 if client_id then
-  local completion = require('opencode.ui.completion')
   -- track insert start state
   vim.api.nvim_create_autocmd('InsertEnter', {
     buffer = bufnr,
     callback = function()
+      if not completion.has_completion_engine() then
+        vim.lsp.completion.enable(true, client_id, bufnr, { autotrigger = true })
+      end
       completion.on_insert_enter()
     end,
   })

lua/opencode/api.lua

@@ -359,19 +359,19 @@ function M.mention()
   local char = config.get_key_for_function('input_window', 'mention')
 
   ui.focus_input({ restore_position = false, start_insert = true })
-  -- require('opencode.ui.completion').trigger_completion(char)()
+  vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(char, true, false, true), 'n', false)
 end
 
 function M.context_items()
   local char = config.get_key_for_function('input_window', 'context_items')
   ui.focus_input({ restore_position = false, start_insert = true })
-  -- require('opencode.ui.completion').trigger_completion(char)()
+  vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(char, true, false, true), 'n', false)
 end
 
 function M.slash_commands()
   local char = config.get_key_for_function('input_window', 'slash_commands')
   ui.focus_input({ restore_position = false, start_insert = true })
-  -- require('opencode.ui.completion').trigger_completion(char)()
+  vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(char, true, false, true), 'n', false)
 end
 
 function M.focus_input()

lua/opencode/init.lua

@@ -11,8 +11,8 @@ function M.setup(opts)
   require('opencode.ui.highlight').setup()
   require('opencode.core').setup()
   require('opencode.api').setup()
-  require('opencode.keymap').setup(config.keymap)
   require('opencode.ui.completion').setup()
+  require('opencode.keymap').setup(config.keymap)
   require('opencode.event_manager').setup()
   require('opencode.context').setup()
   require('opencode.ui.context_bar').setup()

lua/opencode/keymap.lua

@@ -25,7 +25,6 @@ local function process_keymap_entry(keymap_config, default_modes, base_opts, def
   for key_binding, config_entry in pairs(keymap_config) do
     if config_entry == false then
       -- Skip keymap if explicitly set to false (disabled)
-    elseif key_binding == '@' or key_binding == '/' or key_binding == '#' then
     elseif config_entry then
       local func_name = config_entry[1]
       local callback = type(func_name) == 'function' and func_name or api[func_name]

lua/opencode/lsp/opencode_ls.lua …/opencode/lsp/opencode_completion_ls.lualua/opencode/lsp/opencode_ls.lua renamed to lua/opencode/lsp/opencode_completion_ls.lua lua/opencode/lsp/opencode_ls.lua renamed to lua/opencode/lsp/opencode_completion_ls.lua

@@ -7,43 +7,22 @@ local M = {}
 local handlers = {}
 local ms = vim.lsp.protocol.Methods
 
----Parse trigger characters from all registered completion sources
----@return string[]
-local function get_trigger_characters()
-  local chars = {}
-  local config = require('opencode.config')
-
-  -- Get trigger characters from keymaps
-  local triggers = {
-    config.get_key_for_function('input_window', 'mention'), -- @ for subagents
-    config.get_key_for_function('input_window', 'slash_commands'), -- / for commands
-    config.get_key_for_function('input_window', 'context_items'), -- # for context
-  }
-
-  for _, trigger in ipairs(triggers) do
-    if trigger and not vim.tbl_contains(chars, trigger) then
-      table.insert(chars, trigger)
-    end
-  end
-
-  return chars
-end
-
 ---Initialize handler - negotiates capabilities with the client
 ---@param params lsp.InitializeParams
 ---@param callback fun(err?: lsp.ResponseError, result: lsp.InitializeResult)
 handlers[ms.initialize] = function(params, callback)
-  local trigger_chars = get_trigger_characters()
+  local completion = require('opencode.ui.completion')
+  local triggers = completion.get_trigger_characters()
 
   callback(nil, {
     capabilities = {
       completionProvider = {
         resolveProvider = true,
-        triggerCharacters = trigger_chars,
+        triggerCharacters = triggers,
       },
     },
     serverInfo = {
-      name = 'opencode_ls',
+      name = 'opencode_completion_ls',
       version = '1.0.0',
     },
   })
@@ -55,6 +34,7 @@ end
 ---@return string trigger_char
 ---@return string full_line
 local function get_completion_context(params)
+  local completion = require('opencode.ui.completion')
   local bufnr = vim.api.nvim_get_current_buf()
   local line_num = params.position.line + 1 -- LSP is 0-indexed
   local col = params.position.character
@@ -64,14 +44,7 @@ local function get_completion_context(params)
   local line_to_cursor = line:sub(1, col)
 
   -- Find the trigger character
-  local trigger_char = ''
-  local config = require('opencode.config')
-  local triggers = {
-    config.get_key_for_function('input_window', 'mention'),
-    config.get_key_for_function('input_window', 'slash_commands'),
-    config.get_key_for_function('input_window', 'context_items'),
-  }
-
+  local triggers = completion.get_trigger_characters()
   for _, t in ipairs(triggers) do
     if t and line_to_cursor:match(vim.pesc(t) .. '[^%s]*$') then
       trigger_char = t
@@ -88,24 +61,23 @@ local function get_completion_context(params)
   return word, trigger_char, line
 end
 
+local function supports_kind_icons()
+  -- only blink.cmp supports kind icons currently, so we check for its presence
+  local has_blink_cmp = pcall(require, 'blink.cmp')
+  return has_blink_cmp
+end
+
 ---Convert opencode CompletionItem to LSP CompletionItem
 ---@param item CompletionItem
 ---@param index integer
 ---@return lsp.CompletionItem
 local function to_lsp_item(item, index)
-  -- Map opencode kinds to LSP kinds
-  local kind_map = {
-    file = vim.lsp.protocol.CompletionItemKind.File,
-    subagent = vim.lsp.protocol.CompletionItemKind.Class,
-    command = vim.lsp.protocol.CompletionItemKind.Function,
-    context = vim.lsp.protocol.CompletionItemKind.Variable,
-  }
   local source = require('opencode.ui.completion').get_source_by_name(item.source_name)
 
   local lsp_item = {
-    label = item.kind_icon .. item.label,
-    kind = 0,
-    kind_icon = '',
+    label = (supports_kind_icons() and '' or (item.kind_icon .. ' ')) .. item.label,
+    kind = vim.lsp.protocol.CompletionItemKind.Text,
+    kind_icon = supports_kind_icons() and item.kind_icon or nil, -- Only include kind_icon if supported
     kind_hl = item.kind_hl,
     detail = item.detail,
     documentation = item.documentation and {
@@ -139,39 +111,41 @@ handlers[ms.textDocument_completion] = function(params, callback)
     line = line,
   }
 
-  -- Get all registered sources
   local completion = require('opencode.ui.completion')
   local sources = completion.get_sources()
 
-  -- Collect promises from all sources
   local Promise = require('opencode.promise')
   local promises = {}
 
   for _, source in ipairs(sources) do
-    if source.complete then
-      table.insert(promises, source.complete(completion_context))
-    end
+    table.insert(promises, source.complete(completion_context))
   end
 
-  -- Wait for all sources to complete in parallel
   Promise.all(promises)
     :and_then(function(results)
       local all_items = {}
 
-      -- Flatten results from all sources
+      local is_incomplete = false
       for i, items in ipairs(results) do
-        if type(items) == 'table' then
-          for _, item in ipairs(items) do
-            table.insert(all_items, to_lsp_item(item, i))
+        for _, item in ipairs(items or {}) do
+          local source = completion.get_source_by_name(item.source_name)
+          if source and source.is_incomplete then
+            is_incomplete = true
           end
+
+          table.insert(all_items, to_lsp_item(item, i))
         end
       end
 
-      callback(nil, all_items)
+      callback(nil, {
+        isIncomplete = is_incomplete,
+        items = all_items,
+      })
       completion.store_completion_items(all_items)
     end)
     :catch(function(err)
-      vim.notify('Opencode LSP completion error: ' .. tostring(err), vim.log.levels.ERROR)
+      local log = require('opencode.log')
+      log.error('Error in completion handler: ' .. tostring(err))
       callback(nil, {})
     end)
 end
@@ -182,17 +156,14 @@ end
 handlers[ms.completionItem_resolve] = function(params, callback)
   local item = vim.deepcopy(params)
 
-  -- Additional resolution can be done here if needed
-  -- For now, documentation is already attached in textDocument_completion
-
   callback(nil, item)
 end
 
 ---Create the LSP server configuration
 ---@return vim.lsp.ClientConfig
 function M.create_config()
   return {
-    name = 'opencode_ls',
+    name = 'opencode_completion_ls',
     cmd = function(dispatchers, config)
       return {
         request = function(method, params, callback)
@@ -219,19 +190,4 @@ function M.start(bufnr)
   return vim.lsp.start(config, { bufnr = bufnr, silent = false })
 end
 
----Hook into completion item selection to trigger on_complete callbacks
----This is called when a completion item is confirmed/selected
----@param item lsp.CompletionItem
-function M.on_completion_done(item)
-  if not item or not item.data or not item.data._opencode_item then
-    return
-  end
-
-  local completion = require('opencode.ui.completion')
-  local original_item = item.data._opencode_item
-
-  -- Call the source's on_complete callback
-  completion.on_complete(original_item)
-end
-
 return M

lua/opencode/types.lua

@@ -411,6 +411,7 @@
 ---@field priority number Priority for ordering sources
 ---@field complete fun(context: CompletionContext): Promise<CompletionItem[]> Function to generate completion items
 ---@field on_complete fun(item: CompletionItem): nil Optional callback when item is selected
+---@field is_incomplete? boolean Whether the completion results are incomplete (for sources that support pagination)
 
 ---@class OpencodeContext
 ---@field current_file OpencodeContextFile|nil