add context path expansion at the input with both @ and #

Author: joaopluigi

lua/eca/completion/blink/context.lua

@@ -20,7 +20,7 @@ end
 
 -- (Optional) Non-alphanumeric characters that trigger the source
 function source:get_trigger_characters()
-  return { "@" }
+  return { "@", "#" }
 end
 
 ---@param context eca.ChatContext
@@ -31,13 +31,13 @@ local function as_completion_item(context)
   ---@diagnostic disable-next-line: missing-fields
   local item = {}
   if context.type == "file" then
-    item.label = string.format("@%s", vim.fn.fnamemodify(context.path, ":."))
+    item.label = 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.label = vim.fn.fnamemodify(context.path, ":.")
     item.kind = kinds.Folder
   elseif context.type == "web" then
     item.label = context.url

lua/eca/completion/cmp/context.lua

@@ -7,13 +7,13 @@ local function as_completion_item(context)
   ---@diagnostic disable-next-line: missing-fields
   local item = {}
   if context.type == "file" then
-    item.label = string.format("@%s", vim.fn.fnamemodify(context.path, ":."))
+    item.label = vim.fn.fnamemodify(context.path, ":.")
     item.kind = cmp.lsp.CompletionItemKind.File
     item.data = {
       context_item = context,
     }
   elseif context.type == "directory" then
-    item.label = string.format("@%s", vim.fn.fnamemodify(context.path, ":."))
+    item.label = vim.fn.fnamemodify(context.path, ":.")
     item.kind = cmp.lsp.CompletionItemKind.Folder
   elseif context.type == "web" then
     item.label = context.url
@@ -40,7 +40,7 @@ function source.new()
 end
 
 function source:get_trigger_characters()
-  return { "@" }
+  return { "@", "#" }
 end
 
 function source:get_keyword_pattern()

lua/eca/completion/commands.lua

@@ -10,20 +10,31 @@ end
 ---@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
+  local eca = require("eca")
+  local chat = eca.get()
 
-    if result and result.commands then
-      local items = vim.iter(result.commands):map(as_completion_item):totable()
-      callback({ items = items })
-    else
-      callback({ items = {} })
-    end
-  end)
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA sidebar", vim.log.levels.WARN)
+    return
+  end
+
+  chat.mediator:send("chat/queryCommands", {
+      chatId = chat.mediator:id(),
+      query = query,
+    },
+    function(err, result)
+      if err then
+        ---@diagnostic disable-next-line: missing-fields
+        callback({ items = {} })
+      end
+
+      if result and result.commands then
+        local items = vim.iter(result.commands):map(as_completion_item):totable()
+        callback({ items = items })
+      else
+        callback({ items = {} })
+      end
+    end)
 end
 
 return M

lua/eca/completion/context.lua

@@ -7,7 +7,7 @@ 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%./_\\%-~]*)")
+  local it = before_cursor:gmatch("[@#]([%w%./_\\%-~]*)")
   for match in it do
     table.insert(matches, match)
   end
@@ -18,20 +18,32 @@ end
 ---@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 = {} })
-      return
-    end
+  local eca = require("eca")
+  local chat = eca.get()
 
-    if result and result.contexts then
-      local items = vim.iter(result.contexts):map(as_completion_item):totable()
-      callback({ items = items })
-    else
-      callback({ items = {} })
-    end
-  end)
+  if not chat or not chat.mediator then
+    Logger.notify("No active ECA sidebar", vim.log.levels.WARN)
+    return
+  end
+
+  chat.mediator:send("chat/queryContext", {
+      chatId = chat.mediator:id(),
+      query = query,
+      contexts = chat.mediator:contexts() or {},
+    },
+    function(err, result)
+      if err then
+        callback({ items = {} })
+        return
+      end
+
+      if result and result.contexts then
+        local items = vim.iter(result.contexts):map(as_completion_item):totable()
+        callback({ items = items })
+      else
+        callback({ items = {} })
+      end
+    end)
 end
 
 --- Taken from https://github.com/hrsh7th/cmp-path/blob/9a16c8e5d0be845f1d1b64a0331b155a9fe6db4d/lua/cmp_path/init.lua
@@ -89,7 +101,10 @@ function M.execute(completion_item, callback)
   if completion_item.data then
     vim.api.nvim_exec_autocmds("User", {
       pattern = { "CompletionItemSelected" },
-      data = completion_item.data.context_item,
+      data = {
+        context_item = completion_item.data.context_item,
+        label = completion_item.label,
+      }
     })
     callback(completion_item)
   end

lua/eca/mediator.lua

@@ -111,16 +111,30 @@ function mediator:send(method, params, callback)
     require("eca.logger").notify("Server is not rnning, please start the server", vim.log.levels.WARN)
   end
 
-  local contexts = {}
+  if params.contexts then
+    local contexts = {}
 
-  for _, context in pairs(params.contexts) do
-    local adapted = context_adapter(context)
-    if adapted then
-      table.insert(contexts, adapted)
+    for _, context in pairs(params.contexts) do
+      local adapted = context_adapter(context)
+      if adapted then
+        table.insert(contexts, adapted)
+      end
     end
+
+    params.contexts = contexts
   end
 
-  params.contexts = contexts
+  if params.message and type(params.message) == "string" then
+    local message = params.message:gsub("([@#])([%w%._%-%/]+)", function(prefix, path)
+      -- expand ~
+      if path:sub(1,1) == "~" then
+        path = vim.fn.expand(path)
+      end
+      return prefix .. vim.fn.fnamemodify(path, ":p")
+    end)
+
+    params.message = message
+  end
 
   self.server:send_request(method, params, callback)
 end

lua/eca/sidebar.lua

@@ -384,16 +384,16 @@ function M:_setup_input_events(container)
   vim.api.nvim_create_autocmd("User", {
     pattern = { "CompletionItemSelected" },
     callback = function(event)
-      if not event.data or not event.data.path or not event.data.type then
+      if not event.data or not event.data.context_item or not event.data.label then
         return
       end
 
       if self._contexts then
         self._contexts.to_add = {
-          name = vim.fn.fnamemodify(event.data.path, ":."),
-          type = event.data.type,
+          name = event.data.label,
+          type = event.data.context_item.type,
           data = {
-            path = event.data.path
+            path = event.data.context_item.path
           }
         }
       end
@@ -404,10 +404,6 @@ function M:_setup_input_events(container)
   vim.api.nvim_buf_attach(container.bufnr, false, {
     on_lines = function(_, buf, _changedtick, first, _last, _new_last, _bytecount)
       vim.schedule(function()
-        if first ~= 0 and first ~= 1 then
-          return
-        end
-
         local lines = vim.api.nvim_buf_get_lines(buf, 0, -1, false)
 
         -- handle empty buffer
@@ -431,7 +427,10 @@ function M:_setup_input_events(container)
         end
 
         local prefix_mark = vim.api.nvim_buf_get_extmark_by_id(buf, prefix_ns, prefix_id, {})
-        local prefix_row = unpack(prefix_mark)
+        local prefix_row = 1
+        if prefix_mark and type(prefix_mark) == "table" and prefix_mark[1] ~= nil then
+          prefix_row = tonumber(prefix_mark[1]) or 1
+        end
         local contexts_row = 0
 
         local prefix_line = lines[prefix_row + 1] or nil
@@ -485,6 +484,7 @@ function M:_setup_input_events(container)
             for i = 1, #placeholders do
               if context_to_add.name and context_to_add.name == placeholders[i] then
                 self.mediator:add_context(context_to_add)
+                self._contexts.to_add = {}
               end
             end
 
@@ -494,6 +494,7 @@ function M:_setup_input_events(container)
           self:_update_input_display()
           return
         end
+
       end)
     end
   })
@@ -750,7 +751,7 @@ function M:_update_input_display(opts)
 
     for i, context_name in ipairs(contexts_name) do
       self.extmarks.contexts._id[i] = vim.api.nvim_buf_set_extmark(
-    input.bufnr,
+        input.bufnr,
         self.extmarks.contexts._ns,
         0,
         i,