Add blink completion support

Author: tomgeorge

after/plugin/eca-nvim.lua

@@ -10,3 +10,20 @@ if has_cmp then
     },
   })
 end
+
+local has_blink, blink = pcall(require, "blink.cmp")
+if has_blink then
+  blink.add_source_provider("eca_commands", {
+    name = "eca_commands",
+    module = "eca.completion.blink.commands",
+    enabled = true,
+  })
+  blink.add_filetype_source("eca-input", "eca_commands")
+
+  blink.add_source_provider("eca_contexts", {
+    name = "eca_contexts",
+    module = "eca.completion.blink.context",
+    enabled = true,
+  })
+  blink.add_filetype_source("eca-input", "eca_contexts")
+end

lua/eca/completion/blink/commands.lua

@@ -0,0 +1,49 @@
+local source = {}
+
+-- `opts` table comes from `sources.providers.your_provider.opts`
+-- You may also accept a second argument `config`, to get the full
+-- `sources.providers.your_provider` table
+function source.new(opts)
+  -- vim.validate("your-source.opts.some_option", opts.some_option, { "string" })
+  -- vim.validate("your-source.opts.optional_option", opts.optional_option, { "string" }, true)
+
+  local self = setmetatable({}, { __index = source })
+  self.opts = opts
+  return self
+end
+
+function source:enabled()
+  return vim.bo.filetype == "eca-input"
+end
+
+---@return lsp.CompletionItem
+---@param command eca.ChatCommand
+local function as_completion_item(command)
+  ---@type lsp.CompletionItem
+  return {
+    label = command.name,
+    detail = command.description or ("ECA command: " .. command.name),
+    documentation = command.help and {
+      kind = "markdown",
+      value = command.help,
+    } or nil,
+  }
+end
+
+-- (Optional) Non-alphanumeric characters that trigger the source
+function source:get_trigger_characters()
+  return { "/" }
+end
+
+---@module 'blink.cmp'
+---@param ctx blink.cmp.Context
+---@param callback fun(response?: blink.cmp.CompletionResponse)
+function source:get_completions(ctx, callback)
+  local commands = require("eca.completion.commands")
+  local q = commands.get_query(ctx.line)
+  if q then
+    commands.get_completion_candidates(q, as_completion_item, callback)
+  end
+end
+
+return source

lua/eca/completion/blink/context.lua

@@ -0,0 +1,70 @@
+---@module 'blink.cmp'
+---@class blink.cmp.Source
+local source = {}
+
+-- `opts` table comes from `sources.providers.your_provider.opts`
+-- You may also accept a second argument `config`, to get the full
+-- `sources.providers.your_provider` table
+function source.new(opts)
+  -- vim.validate("your-source.opts.some_option", opts.some_option, { "string" })
+  -- vim.validate("your-source.opts.optional_option", opts.optional_option, { "string" }, true)
+
+  local self = setmetatable({}, { __index = source })
+  self.opts = opts
+  return self
+end
+
+function source:enabled()
+  return vim.bo.filetype == "eca-input"
+end
+
+-- (Optional) Non-alphanumeric characters that trigger the source
+function source:get_trigger_characters()
+  return { "@" }
+end
+
+---@param context eca.ChatContext
+---@return lsp.CompletionItem
+local function as_completion_item(context)
+  local kinds = require("blink.cmp.types").CompletionItemKind
+  ---@type lsp.CompletionItem
+  ---@diagnostic disable-next-line: missing-fields
+  local item = {}
+  if context.type == "file" then
+    item.label = string.format("@%s", vim.fn.fnamemodify(context.path, ":."))
+    item.kind = kinds.File
+    item.data = {
+      context_item = context,
+    }
+  elseif context.type == "directory" then
+    item.label = string.format("@%s", vim.fn.fnamemodify(context.path, ":."))
+    item.kind = kinds.Folder
+  elseif context.type == "web" then
+    item.label = context.url
+    item.kind = kinds.File
+  elseif context.type == "repoMap" then
+    item.label = "repoMap"
+    item.kind = kinds.Module
+    item.detail = "Summary view of workspace files."
+  elseif context.type == "mcpResource" then
+    item.label = string.format("%s:%s", context.server, context.name)
+    item.kind = kinds.Struct
+    item.detail = context.description
+  end
+  if not item.label then
+    return {}
+  end
+  return item
+end
+
+---@param ctx blink.cmp.Context
+---@param callback fun(response?: blink.cmp.CompletionResponse)
+function source:get_completions(ctx, callback)
+  local context = require("eca.completion.context")
+  local query = context.get_query(ctx.line, ctx.cursor)
+  if query then
+    context.get_completion_candidates(query, as_completion_item, callback)
+  end
+end
+
+return source

lua/eca/completion/cmp/commands.lua

@@ -1,53 +1,17 @@
----@param commands eca.ChatCommand
----@return lsp.CompletionItem[]
-local function create_completion_items(commands)
-  ---@type lsp.CompletionItem[]
-  local items = {}
-
-  if commands then
-    for _, command in ipairs(commands) do
-      ---@type lsp.CompletionItem
-      local item = {
-        label = command.name or command.command,
-        kind = vim.lsp.protocol.CompletionItemKind.Function,
-        detail = command.description or ("ECA command: " .. (command.name or command.command)),
-        documentation = command.help and {
-          kind = "markdown",
-          value = command.help,
-        } or nil,
-        insertText = command.name or command.command,
-      }
-      table.insert(items, item)
-    end
-  end
-
-  return items
-end
-
----@param s string
----@return string
-local function get_query(s)
-  local match = s:match("^>?%s*/(.*)$")
-  return match
-end
-
--- Query server for available commands
-local function query_server_commands(query, callback)
-  local eca = require("eca")
-  if not eca.server or not eca.server:is_running() then
-    callback({})
-    return
-  end
-
-  eca.server:send_request("chat/queryCommands", { query = query }, function(err, result)
-    if err then
-      callback({})
-      return
-    end
-
-    local items = create_completion_items(result.commands)
-    callback(items)
-  end)
+---@param command eca.ChatCommand
+---@return lsp.CompletionItem
+local function as_completion_item(command)
+  local cmp = require("cmp")
+  ---@type lsp.CompletionItem
+  return {
+    label = command.name,
+    kind = cmp.lsp.CompletionItemKind.Function,
+    detail = command.description or ("ECA command: " .. command.name),
+    documentation = command.help and {
+      kind = "markdown",
+      value = command.help,
+    } or nil,
+  }
 end
 
 local source = {}
@@ -56,41 +20,21 @@ source.new = function()
   return setmetatable({ cache = {} }, { __index = source })
 end
 
-source.get_trigger_characters = function()
+function source:get_trigger_characters()
   return { "/" }
 end
 
-source.is_available = function()
+function source:is_available()
   return vim.bo.filetype == "eca-input"
 end
 
 ---@diagnostic disable-next-line: unused-local
-source.complete = function(self, _, callback)
+function source:complete(params, callback)
   -- Only complete if we're typing a command (starts with /)
-  local line = vim.api.nvim_get_current_line()
-  local query = get_query(line)
-
-  -- Only provide command completions when we have / followed by word characters or at word boundary
+  local commands = require("eca.completion.commands")
+  local query = commands.get_query(params.context.cursor_line)
   if query then
-    local bufnr = vim.api.nvim_get_current_buf()
-
-    if self.cache[bufnr] and self.cache[bufnr][query] then
-      callback({ items = self.cache[bufnr][query], isIncomplete = false })
-    else
-      query_server_commands(query, function(items)
-        callback({
-          items = items,
-          isIncomplete = false,
-        })
-        self.cache[bufnr] = {}
-        self.cache[bufnr][query] = items
-      end)
-    end
-  else
-    callback({
-      items = {},
-      isIncomplete = false,
-    })
+    commands.get_completion_candidates(query, as_completion_item, callback)
   end
 end
 return source

lua/eca/completion/cmp/context.lua

@@ -1,6 +1,7 @@
 local cmp = require("cmp")
+---@module 'cmp'
 ---@param context eca.ChatContext
----@return lsp.CompletionItem
+---@return cmp.CompletionItem
 local function as_completion_item(context)
   ---@type lsp.CompletionItem
   ---@diagnostic disable-next-line: missing-fields
@@ -32,27 +33,6 @@ local function as_completion_item(context)
   return item
 end
 
--- Query server for available contexts
--- @param query string
---
-local function query_server_contexts(query, callback)
-  local eca = require("eca")
-  if not eca.server or not eca.server:is_running() then
-    callback({})
-    return
-  end
-
-  eca.server:send_request("chat/queryContext", { query = query }, function(err, result)
-    if err then
-      callback({})
-      return
-    end
-
-    local items = vim.iter(result.contexts):map(as_completion_item):totable()
-    callback({ items = items, isIncomplete = true })
-  end)
-end
-
 local source = {}
 
 function source.new()
@@ -71,28 +51,13 @@ function source:is_available()
   return vim.bo.filetype == "eca-input"
 end
 
----@param cursor_line string
----@param cursor_position lsp.Position|vim.Position
----@return string
-local function get_query(cursor_line, cursor_position)
-  local before_cursor = cursor_line:sub(1, cursor_position.col)
-  ---@type string[]
-  local matches = {}
-  local it = before_cursor:gmatch("@([%w%./_\\%-~]*)")
-  for match in it do
-    table.insert(matches, match)
-  end
-  return matches[#matches]
-end
-
 ---@param params cmp.SourceCompletionApiParams
 ---@diagnostic disable-next-line: unused-local
 function source:complete(params, callback)
-  local query = get_query(params.context.cursor_line, params.context.cursor)
+  local context = require("eca.completion.context")
+  local query = context.get_query(params.context.cursor_line, params.context.cursor)
   if query then
-    query_server_contexts(query, function(items)
-      callback(items)
-    end)
+    context.get_completion_candidates(query, as_completion_item, callback)
   end
 end
 

lua/eca/completion/commands.lua

@@ -0,0 +1,30 @@
+local M = {}
+
+---@param s string
+---@return string?
+function M.get_query(s)
+  return s:match("^>?%s*/(.*)$") -- Cursor character followed by slash
+end
+
+---@param query string
+---@param as_completion_item fun(eca.ChatCommand): lsp.CompletionItem
+---@param callback fun(resp: {items: lsp.CompletionItem[], isIncomplete?: boolean, is_incomplete_forward?: boolean, is_incomplete_backward?: boolean})
+function M.get_completion_candidates(query, as_completion_item, callback)
+  local server = require("eca").server
+  server:send_request("chat/queryCommands", { query = query }, function(err, result)
+    if err then
+      ---@diagnostic disable-next-line: missing-fields
+      callback({ items = {} })
+    end
+
+    if not result and not result.commands then
+      ---@diagnostic disable-next-line: missing-fields
+      callback({ items = {} })
+    end
+
+    local items = vim.iter(result.commands):map(as_completion_item):totable()
+    callback({ items = items })
+  end)
+end
+
+return M

lua/eca/completion/context.lua

@@ -0,0 +1,32 @@
+local M = {}
+
+---@param cursor_line string
+---@param cursor_position lsp.Position|vim.Position
+---@return string
+function M.get_query(cursor_line, cursor_position)
+  local before_cursor = cursor_line:sub(1, cursor_position.col)
+  ---@type string[]
+  local matches = {}
+  local it = before_cursor:gmatch("@([%w%./_\\%-~]*)")
+  for match in it do
+    table.insert(matches, match)
+  end
+  return matches[#matches]
+end
+
+---@param query string
+---@param as_completion_item fun(eca.ChatContext): lsp.CompletionItem
+---@param callback fun(resp: {items: lsp.CompletionItem[], isIncomplete?: boolean, is_incomplete_forward?: boolean, is_incomplete_backward?: boolean})
+function M.get_completion_candidates(query, as_completion_item, callback)
+  local server = require("eca").server
+  server:send_request("chat/queryContext", { query = query }, function(err, result)
+    if err then
+      callback({ items = { items = {} } })
+      return
+    end
+
+    local items = vim.iter(result.contexts):map(as_completion_item):totable()
+    callback({ items = items })
+  end)
+end
+return M