add to contexts when completion on contexts area

Author: joaopluigi

lua/eca/completion/blink/context.lua

@@ -73,4 +73,11 @@ function source:resolve(item, callback)
   require("eca.completion.context").resolve_completion_item(item, callback)
 end
 
+---Executed after the item was selected
+---@param item lsp.CompletionItem
+---@param callback fun(any)
+function source:execute(item, callback)
+  require("eca.completion.context").execute(item, callback)
+end
+
 return source

lua/eca/completion/cmp/context.lua

@@ -66,4 +66,11 @@ function source:resolve(completion_item, callback)
   require("eca.completion.context").resolve_completion_item(completion_item, callback)
 end
 
+---Executed after the item was selected.
+---@param completion_item lsp.CompletionItem
+---@param callback fun(completion_item: lsp.CompletionItem|nil)
+function source:execute(completion_item, callback)
+  require("eca.completion.context").execute(completion_item, callback)
+end
+
 return source

lua/eca/completion/context.lua

@@ -78,11 +78,21 @@ function M.resolve_completion_item(completion_item, callback)
     if context_item.type == "file" then
       completion_item.documentation = documentation(context_item, 20)
     end
+    callback(completion_item)
+  end
+end
+
+---Executed after the item was selected
+---@param completion_item lsp.CompletionItem
+---@param callback fun(any)
+function M.execute(completion_item, callback)
+  if completion_item.data then
     vim.api.nvim_exec_autocmds("User", {
-      pattern = { "EcaChatContextUpdated" },
+      pattern = { "CompletionItemSelected" },
       data = completion_item.data.context_item,
     })
     callback(completion_item)
   end
 end
+
 return M

lua/eca/sidebar.lua

@@ -62,7 +62,7 @@ function M.new(id, mediator)
   }
   instance._welcome_message_applied = false
   instance._contexts_placeholder_line = ""
-  instance._contexts_to_resolve = {}
+  instance._contexts = {}
 
   require("eca.observer").subscribe("sidebar-" .. id, function(message)
     instance:handle_chat_content(message)
@@ -189,7 +189,7 @@ function M:reset()
   self._current_status = ""
   self._welcome_message_applied = false
   self._contexts_placeholder_line = ""
-  self._contexts_to_resolve = {}
+  self._contexts = {}
 end
 
 function M:new_chat()
@@ -382,18 +382,25 @@ end
 ---@param container NuiSplit
 function M:_setup_input_events(container)
   vim.api.nvim_create_autocmd("User", {
-    pattern = { "EcaChatContextUpdated" },
+    pattern = { "CompletionItemSelected" },
     callback = function(event)
-      local context_to_resolve = {
-        path = event.data.path,
-        name = vim.fn.fnamemodify(event.data.path, ":.")
-      }
+      if not event.data or not event.data.path or not event.data.type then
+        return
+      end
 
-      table.insert(self._contexts_to_resolve, context_to_resolve)
+      if self._contexts then
+        self._contexts.to_add = {
+          name = vim.fn.fnamemodify(event.data.path, ":."),
+          type = event.data.type,
+          data = {
+            path = event.data.path
+          }
+        }
+      end
     end,
   })
 
-  -- prevent contexts line or input prefix from being deleted
+  -- contexts area and input handler
   vim.api.nvim_buf_attach(container.bufnr, false, {
     on_lines = function(_, buf, _changedtick, first, _last, _new_last, _bytecount)
       vim.schedule(function()
@@ -434,13 +441,11 @@ function M:_setup_input_events(container)
         if prefix_row == contexts_row then
           -- prefix line missing, restore
           if contexts_line == contexts_placeholder_line then
-           -- Logger.test("prefix line missing, restore")
             self:_update_input_display()
             return
           end
 
           -- we can consider that contexts were deleted
-          -- Logger.test("contexts cleared")
           self.mediator:clear_contexts()
           return
         end
@@ -451,6 +456,14 @@ function M:_setup_input_events(container)
           return
         end
 
+        -- something wrong, restore
+        if prefix_row - contexts_row ~= 1 then
+          self:_update_input_display()
+          return
+        end
+
+        local context_to_add = self._contexts.to_add or {}
+
         if contexts_line ~= contexts_placeholder_line then
           -- a context was removed
           if #contexts_line < #self._contexts_placeholder_line then
@@ -465,18 +478,16 @@ function M:_setup_input_events(container)
             end
           end
 
-          -- contexts line modified, restore
-          if #contexts_line >  #self._contexts_placeholder_line then
-            local placeholders = vim.split(contexts_line, "@", { plain = true, trimempty = false })
+          -- contexts line modified
+          if #contexts_line > #self._contexts_placeholder_line then
+            local placeholders = vim.split(contexts_line, "@", { plain = true, trimempty = true })
 
-            if #placeholders[#placeholders] < 1 then
-              self:_update_input_display()
-              return
+            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)
+              end
             end
 
-            vim.notify("Contexts line: " .. contexts_line, vim.log.levels.DEBUG)
-            vim.notify("Contexts to resolve: " .. vim.inspect(self._contexts_to_resolve), vim.log.levels.DEBUG)
-
             return
           end