chore(completion): general cleanup

Author: sudo-tee

lua/opencode/context.lua

@@ -1,7 +1,7 @@
 -- Gathers editor context
 
 local util = require('opencode.util')
-local config = require('opencode.config')
+local config = require('opencode.config') --[[@as OpencodeConfig]]
 local state = require('opencode.state')
 
 local M = {}

lua/opencode/ui/completion/context.lua

@@ -199,6 +199,31 @@ local function add_cursor_data_item(ctx)
   )
 end
 
+--- Remove the inserted completion text from the input buffer
+---@param item CompletionItem
+local function remove_inserted_text(item)
+  local input_win = require('opencode.ui.input_window')
+  vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Esc>', true, false, true), 'n')
+
+  local _, col = unpack(vim.api.nvim_win_get_cursor(0))
+  local line = vim.api.nvim_get_current_line()
+  local key = config.get_key_for_function('input_window', 'context_items')
+
+  local completion_text = key .. (item.label or item.insert_text or '')
+  local text_start = col - #completion_text
+
+  if text_start >= 0 and line:sub(text_start + 1, col) == completion_text then
+    line = line:sub(1, text_start) .. line:sub(col + 1)
+    input_win.set_current_line(line)
+    vim.api.nvim_win_set_cursor(0, { vim.api.nvim_win_get_cursor(0)[1], text_start })
+  elseif col > 0 and line:sub(col, col) == key then
+    line = line:sub(1, col - 1) .. line:sub(col + 1)
+    input_win.set_current_line(line)
+  end
+
+  vim.fn.feedkeys(vim.api.nvim_replace_termcodes('a', true, false, true), 'n')
+end
+
 ---@type CompletionSource
 local context_source = {
   name = 'context',
@@ -260,27 +285,8 @@ local context_source = {
       context.remove_selection(item.data.additional_data --[[@as OpencodeContextSelection]])
     end
 
-    -- Remove the inserted completion text from the input buffer
     vim.schedule(function()
-      vim.fn.feedkeys(vim.api.nvim_replace_termcodes('<Esc>', true, false, true), 'n')
-
-      local _, col = unpack(vim.api.nvim_win_get_cursor(0))
-      local line = vim.api.nvim_get_current_line()
-      local key = config.get_key_for_function('input_window', 'context_items')
-
-      local completion_text = key .. (item.label or item.insert_text or '')
-      local text_start = col - #completion_text
-
-      if text_start >= 0 and line:sub(text_start + 1, col) == completion_text then
-        line = line:sub(1, text_start) .. line:sub(col + 1)
-        input_win.set_current_line(line)
-        vim.api.nvim_win_set_cursor(0, { vim.api.nvim_win_get_cursor(0)[1], text_start })
-      elseif col > 0 and line:sub(col, col) == key then
-        line = line:sub(1, col - 1) .. line:sub(col + 1)
-        input_win.set_current_line(line)
-      end
-
-      vim.fn.feedkeys(vim.api.nvim_replace_termcodes('a', true, false, true), 'n')
+      remove_inserted_text(item)
     end)
   end,
 }

lua/opencode/ui/completion/engines/blink_cmp.lua

@@ -14,16 +14,11 @@ function Source:get_trigger_characters()
   local slash_key = config.get_key_for_function('input_window', 'slash_commands')
   local context_key = config.get_key_for_function('input_window', 'context_items')
   local triggers = {}
-  if mention_key then
-    table.insert(triggers, mention_key)
-  end
-  if slash_key then
-    table.insert(triggers, slash_key)
-  end
-  if context_key then
-    table.insert(triggers, context_key)
-  end
-  return triggers
+  return {
+    slash_key or '',
+    mention_key or '',
+    context_key or '',
+  }
 end
 
 function Source:is_available()

lua/opencode/ui/completion/engines/nvim_cmp.lua

@@ -16,17 +16,11 @@ function M.setup(completion_sources)
     local mention_key = config.get_key_for_function('input_window', 'mention')
     local slash_key = config.get_key_for_function('input_window', 'slash_commands')
     local context_key = config.get_key_for_function('input_window', 'context_items')
-    local triggers = {}
-    if mention_key then
-      table.insert(triggers, mention_key)
-    end
-    if slash_key then
-      table.insert(triggers, slash_key)
-    end
-    if context_key then
-      table.insert(triggers, context_key)
-    end
-    return triggers
+    return {
+      slash_key or '',
+      mention_key or '',
+      context_key or '',
+    }
   end
 
   function source:is_available()

lua/opencode/ui/completion/engines/vim_complete.lua

@@ -31,16 +31,11 @@ function M._get_trigger(before_cursor)
   local mention_key = config.get_key_for_function('input_window', 'mention')
   local slash_key = config.get_key_for_function('input_window', 'slash_commands')
   local context_key = config.get_key_for_function('input_window', 'context_items')
-  local triggers = {}
-  if mention_key then
-    table.insert(triggers, mention_key)
-  end
-  if slash_key then
-    table.insert(triggers, slash_key)
-  end
-  if context_key then
-    table.insert(triggers, context_key)
-  end
+  local triggers = {
+    slash_key or '',
+    mention_key or '',
+    context_key or '',
+  }
   local trigger_chars = table.concat(vim.tbl_map(vim.pesc, triggers), '')
   local trigger_char, trigger_match = before_cursor:match('.*([' .. trigger_chars .. '])([%w_%-%.]*)')
   return trigger_char, trigger_match