feat(context-completion): selections are now multiple like files

Author: sudo-tee

lua/opencode/context.lua

@@ -110,10 +110,25 @@ function M.add_selection(selection)
   state.context_updated_at = vim.uv.now()
 end
 
-function M.add_file(file)
-  --- TODO: probably need a way to remove a file once it's been added?
-  --- maybe a keymap like clear all context?
+function M.remove_selection(selection)
+  if not M.context.selections then
+    return
+  end
+
+  for i, sel in ipairs(M.context.selections) do
+    if sel.file.path == selection.file.path and sel.lines == selection.lines then
+      table.remove(M.context.selections, i)
+      break
+    end
+  end
+  state.context_updated_at = vim.uv.now()
+end
 
+function M.clear_selections()
+  M.context.selections = nil
+end
+
+function M.add_file(file)
   if not M.context.mentioned_files then
     M.context.mentioned_files = {}
   end

lua/opencode/ui/completion/context.lua

@@ -5,13 +5,15 @@ local icons = require('opencode.ui.icons')
 
 local M = {}
 
+---@generic T
 ---@param name string
 ---@param type string
 ---@param available boolean
 ---@param documentation string|nil
 ---@param icon string|nil
+---@param additional_data? T
 ---@return CompletionItem
-local function create_context_item(name, type, available, documentation, icon)
+local function create_context_item(name, type, available, documentation, icon, additional_data)
   local label = name
 
   return {
@@ -22,7 +24,7 @@ local function create_context_item(name, type, available, documentation, icon)
     documentation = documentation or (available and name or 'Enable ' .. name .. ' for this message'),
     insert_text = '',
     source_name = 'context',
-    data = { type = type, name = name, available = available },
+    data = { type = type, name = name, available = available, additional_data = additional_data },
   }
 end
 
@@ -52,15 +54,9 @@ local function format_diagnostics(diagnostics)
   return table.concat(parts, ', ')
 end
 
-local function format_selections(selections)
-  local content = {}
-  for _, sel in ipairs(selections or {}) do
-    local lang = sel.file and sel.file.extension or ''
-    local text = string.format('```%s\n%s\n```', lang, sel.content)
-
-    table.insert(content, text)
-  end
-  return table.concat(content, '\n')
+local function format_selection(selection)
+  local lang = selection.file and selection.file.extension or ''
+  return string.format('```%s\n%s\n```', lang, selection.content)
 end
 
 ---@param cursor_data? OpencodeContextCursorData
@@ -112,14 +108,24 @@ local function add_mentioned_files_items(ctx)
 end
 
 ---@param ctx OpencodeContext
----@return CompletionItem
-local function add_selection_item(ctx)
-  return create_context_item(
-    'Selection',
-    'selection',
-    context.is_context_enabled('selection'),
-    format_selections(ctx.selections or {})
-  )
+---@return CompletionItem[]
+local function add_selection_items(ctx)
+  local items = {
+    create_context_item(
+      'Selection' .. (ctx.selections and #ctx.selections > 0 and string.format(' (%d)', #ctx.selections) or ''),
+      'selection',
+      context.is_context_enabled('selection')
+    ),
+  }
+
+  for i, selection in ipairs(ctx.selections or {}) do
+    local label = 'Selection ' .. (selection.file and vim.fn.fnamemodify(selection.file.path, ':t')) or i
+    table.insert(
+      items,
+      create_context_item(label, 'selection_item', true, format_selection(selection), icons.get('selection'), selection)
+    )
+  end
+  return items
 end
 
 ---@param ctx OpencodeContext
@@ -176,10 +182,10 @@ local context_source = {
 
     local items = {
       add_current_file_item(ctx),
-      add_selection_item(ctx),
       add_diagnostics_item(ctx),
       add_cursor_data_item(ctx),
     }
+    vim.list_extend(items, add_selection_items(ctx))
     vim.list_extend(items, add_mentioned_files_items(ctx))
     vim.list_extend(items, add_subagents_items(ctx))
 
@@ -224,6 +230,8 @@ local context_source = {
       local subagent_name = item.data.name:gsub(' %(agent%)$', '')
       context.remove_subagent(subagent_name)
       input_win.remove_mention(subagent_name)
+    elseif type == 'selection_item' then
+      context.remove_selection(item.data.additional_data --[[@as OpencodeContextSelection]])
     end
 
     vim.schedule(function()

lua/opencode/ui/context_bar.lua

@@ -83,8 +83,8 @@ local function create_winbar_segments()
 
   if context.is_context_enabled('selection') and has_selection(ctx) then
     table.insert(segments, {
-      icon = '',
-      text = "'<'> Sel",
+      icon = icons.get('selection'),
+      text = '(' .. #ctx.selections .. ')',
       highlight = 'OpencodeContextSelection',
     })
   end

lua/opencode/ui/highlight.lua

@@ -24,10 +24,10 @@ function M.setup()
     vim.api.nvim_set_hl(0, 'OpencodeHint', { link = 'Comment', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContext', { fg = '#3b4261', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextBar', { fg = '#3b4261', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextCurrentFile', { link = 'Comment', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextAgent', { link = 'Comment', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextSelection', { link = 'Visual', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextError', { link = 'DiagnosticError', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextCurrentFile', { link = 'OpencodeContext', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextAgent', { link = '@label', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextSelection', { link = '@label', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextError', { link = '@label', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextWarning', { link = 'DiagnosticWarn', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextInfo', { link = 'DiagnosticInfo', default = true })
   else
@@ -51,9 +51,9 @@ function M.setup()
     vim.api.nvim_set_hl(0, 'OpencodeHint', { link = 'Comment', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContext', { fg = '#3b4261', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextBar', { fg = '#3b4261', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextCurrentFile', { link = 'Comment', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextAgent', { link = 'Comment', default = true })
-    vim.api.nvim_set_hl(0, 'OpencodeContextSelection', { link = 'Visual', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextCurrentFile', { link = '@label', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextAgent', { link = '@label', default = true })
+    vim.api.nvim_set_hl(0, 'OpencodeContextSelection', { link = '@label', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextError', { link = 'DiagnosticError', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextWarning', { link = 'DiagnosticWarn', default = true })
     vim.api.nvim_set_hl(0, 'OpencodeContextInfo', { link = 'DiagnosticInfo', default = true })

lua/opencode/ui/icons.lua

@@ -4,38 +4,6 @@ local config = require('opencode.config')
 local M = {}
 
 local presets = {
-  emoji = {
-    -- headers
-    header_user = '▌💬',
-    header_assistant = '🤖',
-    -- actions/tools
-    run = '💻',
-    task = '🧰',
-    read = '👀',
-    edit = '✏️',
-    write = '📝',
-    plan = '📃',
-    search = '🔍',
-    web = '🌐',
-    list = '📂',
-    tool = '🔧',
-    snapshot = '📸',
-    restore_point = '🕛',
-    file = '📄',
-    attached_file = '📎',
-    agent = '🤖',
-    -- statuses
-    status_on = '🟢',
-    status_off = '⚫',
-    -- borders and misc
-    border = '▌',
-    -- context bar
-    cursor_data = '📍',
-    context = '📚 ',
-    error = '⛔ ',
-    warning = '⚠️',
-    info = 'ℹ️',
-  },
   nerdfonts = {
     -- headers
     header_user = '▌󰭻 ',
@@ -67,6 +35,7 @@ local presets = {
     error = ' ',
     warning = ' ',
     info = ' ',
+    selection = '󰫙 ',
   },
   text = {
     -- headers
@@ -99,13 +68,12 @@ local presets = {
     error = '[E]',
     warning = '[W]',
     info = '[I] ',
+    selection = "'<'> ",
   },
 }
 
 local deprecated_warning_shown = false
 
-local deprecated_warning_shown = false
-
 ---Get icon by key, honoring preset and user overrides
 ---@param key string
 ---@return string