fix: trigger, docs, so much stuff

Author: Saghen

lua/blink/cmp/sources/init.lua

@@ -4,11 +4,15 @@ local sources = {
     buffer = require('blink.cmp.sources.buffer'),
     snippets = require('blink.cmp.sources.snippets'),
   },
-  in_flight = {
-    lsp = false,
-    buffer = false,
-    snippets = false,
+
+  -- hack: sweet mother of all hacks
+  last_in_flight_id = -1,
+  in_flight_id = {
+    lsp = -1,
+    buffer = -1,
+    snippets = -1,
   },
+
   sources_items = {},
   current_context_id = -1,
   on_completions_callback = function(_) end,
@@ -49,12 +53,16 @@ function sources.completions(context)
     local previous_incomplete = sources.sources_items[source_name] ~= nil
       and sources.sources_items[source_name].isIncomplete
     -- check if we have no data and no calls are in flight
-    local no_data = sources.sources_items[source_name] == nil and sources.in_flight[source_name] == false
+    local no_data = sources.sources_items[source_name] == nil and sources.in_flight_id[source_name] == -1
 
     -- if none of these are true, we can use the existing cached results
     if is_new_context or trigger_character or previous_incomplete or no_data then
       if source.cancel_completions ~= nil then source.cancel_completions() end
-      sources.in_flight[source_name] = true
+
+      -- register the call
+      sources.last_in_flight_id = sources.last_in_flight_id + 1
+      local in_flight_id = sources.last_in_flight_id
+      sources.in_flight_id[source_name] = sources.last_in_flight_id
 
       -- get the reason for the trigger
       local trigger_context = trigger_character
@@ -68,10 +76,10 @@ function sources.completions(context)
       local cursor_column = vim.api.nvim_win_get_cursor(0)[2]
       vim.schedule(function()
         source.completions({ trigger = trigger_context }, function(items)
-          -- context id changing indicates our current data is out of date
-          if sources.current_context_id ~= context.id then return end
+          -- a new call was made or this one was cancelled
+          if sources.in_flight_id[source_name] ~= in_flight_id then return end
+          sources.in_flight_id[source_name] = -1
 
-          sources.in_flight[source_name] = false
           sources.add_source_completions(source_name, items, cursor_column)
           if not sources.some_in_flight() then sources.send_completions() end
         end)
@@ -94,8 +102,8 @@ function sources.add_source_completions(source_name, source_items, cursor_column
 end
 
 function sources.some_in_flight()
-  for _, in_flight in pairs(sources.in_flight) do
-    if in_flight == true then return true end
+  for _, in_flight in pairs(sources.in_flight_id) do
+    if in_flight ~= -1 then return true end
   end
   return false
 end
@@ -122,7 +130,7 @@ end
 
 function sources.cancel_completions()
   for source_name, source in pairs(sources.registered) do
-    sources.in_flight[source_name] = false
+    sources.in_flight_id[source_name] = -1
     if source.cancel_completions ~= nil then source.cancel_completions() end
   end
 end

lua/blink/cmp/trigger.lua

@@ -26,13 +26,14 @@ function trigger.activate_autocmds()
   vim.api.nvim_create_autocmd('TextChangedI', {
     callback = function()
       -- character deleted so let cursormoved handle it
-      if last_char == '' then
-        return
+      if last_char == '' then return end
+
       -- ignore if in a special buffer
-      elseif helpers.is_special_buffer() then
+      if helpers.is_special_buffer() then
         trigger.hide()
-      -- character forces a trigger according to the sources
+      -- character forces a trigger according to the sources, create a fresh context
       elseif vim.tbl_contains(sources.get_trigger_characters(), last_char) then
+        trigger.context = nil
         trigger.show({ trigger_character = last_char })
       -- character is part of the current context OR in an existing context
       elseif last_char:match(trigger.context_regex) ~= nil then
@@ -52,7 +53,13 @@ function trigger.activate_autocmds()
       -- text changed so let textchanged handle it
       if last_char ~= '' then return end
 
-      if trigger.within_query_bounds(vim.api.nvim_win_get_cursor(0)) then
+      local is_within_bounds = trigger.within_query_bounds(vim.api.nvim_win_get_cursor(0))
+
+      local cursor_col = vim.api.nvim_win_get_cursor(0)[2]
+      local char_under_cursor = vim.api.nvim_get_current_line():sub(cursor_col, cursor_col + 1)
+      local is_on_trigger = vim.tbl_contains(sources.get_trigger_characters(), char_under_cursor)
+
+      if is_within_bounds or (is_on_trigger and trigger.context ~= nil) then
         trigger.show()
       else
         trigger.hide()
@@ -66,6 +73,10 @@ function trigger.activate_autocmds()
   return trigger
 end
 
+--- @class TriggerOptions
+--- @field trigger_character string|nil
+---
+--- @param opts TriggerOptions|nil
 function trigger.show(opts)
   opts = opts or {}
 

lua/blink/cmp/windows/autocomplete.lua

@@ -4,8 +4,8 @@ local config = require('blink.cmp.config')
 local autocomplete = {
   items = {},
   event_targets = {
+    on_position_update = function() end,
     on_select = function() end,
-    on_open = function() end,
     on_close = function() end,
   },
 }
@@ -47,6 +47,13 @@ function autocomplete.setup()
     end,
   })
 
+  vim.api.nvim_create_autocmd('CursorMovedI', {
+    callback = function()
+      autocomplete.win:update_position('cursor')
+      autocomplete.event_targets.on_position_update()
+    end,
+  })
+
   return autocomplete
 end
 
@@ -56,28 +63,26 @@ function autocomplete.open_with_items(items)
   autocomplete.items = items
   autocomplete.draw()
 
-  if autocomplete.win:is_open() then
-    -- todo: make a separate function for updating width/height
-    autocomplete.win:update_position()
-  else
-    autocomplete.win:open()
-  end
+  autocomplete.win:open()
+  autocomplete.win:update_position('cursor')
+  autocomplete.event_targets.on_position_update()
 
   -- todo: some logic to maintain the selection if the user moved the cursor?
   vim.api.nvim_win_set_cursor(autocomplete.win:get_win(), { 1, 0 })
+  autocomplete.event_targets.on_select(autocomplete.get_selected_item())
 end
 
+function autocomplete.listen_on_position_update(callback) autocomplete.event_targets.on_position_update = callback end
+
 function autocomplete.open()
   if autocomplete.win:is_open() then return end
   autocomplete.win:open()
-  autocomplete.on_open_callback(autocomplete.win:get_win())
 end
-function autocomplete.listen_on_open(callback) autocomplete.event_targets.on_open = callback end
 
 function autocomplete.close()
   if not autocomplete.win:is_open() then return end
   autocomplete.win:close()
-  autocomplete.on_close_callback()
+  autocomplete.event_targets.on_close()
 end
 function autocomplete.listen_on_close(callback) autocomplete.event_targets.on_close = callback end
 
@@ -91,7 +96,7 @@ function autocomplete.select_next()
   if current_line == line_count then return end
 
   vim.api.nvim_win_set_cursor(autocomplete.win:get_win(), { current_line + 1, 0 })
-  autocomplete.on_select_callback(autocomplete.get_selected_item())
+  autocomplete.event_targets.on_select(autocomplete.get_selected_item())
 end
 
 function autocomplete.select_prev()
@@ -101,7 +106,7 @@ function autocomplete.select_prev()
   if current_line == 1 then return end
 
   vim.api.nvim_win_set_cursor(autocomplete.win:get_win(), { math.max(current_line - 1, 1), 0 })
-  autocomplete.on_select_callback(autocomplete.get_selected_item())
+  autocomplete.event_targets.on_select(autocomplete.get_selected_item())
 end
 
 function autocomplete.listen_on_select(callback) autocomplete.event_targets.on_select = callback end

lua/blink/cmp/windows/documentation.lua

@@ -1,34 +1,34 @@
 -- todo: track cmp_win position
 
 local sources = require('blink.cmp.sources')
-local cmp_win = require('blink.cmp.windows.autocomplete')
+local autocomplete = require('blink.cmp.windows.autocomplete')
 local docs = {}
 
 function docs.setup()
   docs.win = require('blink.cmp.windows.lib').new({
     width = 60,
     max_height = 20,
-    relative = cmp_win.win:get_win(),
     wrap = true,
     -- todo: should be able to use the markdown stuff now?
     -- filetype = 'typescript', -- todo: set dynamically
     padding = true,
   })
 
-  cmp_win.on_select_callback = function(item) docs.set_item(item) end
-  cmp_win.on_open_callback = function() docs.set_item(cmp_win.get_selected_item()) end
-  cmp_win.on_close_callback = function() docs.win:close() end
+  autocomplete.listen_on_position_update(function()
+    if autocomplete.win:get_win() then docs.win:update_position(autocomplete.win:get_win()) end
+  end)
+  autocomplete.listen_on_select(function(item) docs.show_item(item) end)
+  autocomplete.listen_on_close(function() docs.win:close() end)
 
   return docs
 end
 
 -- todo: debounce and only update if the item changed
-function docs.set_item(item)
+function docs.show_item(item)
   if item == nil then
     docs.win:close()
     return
   end
-  if not cmp_win.win:is_open() then return end
 
   sources.resolve(item, function(resolved_item)
     if resolved_item.detail == nil then
@@ -43,7 +43,10 @@ function docs.set_item(item)
     vim.api.nvim_buf_set_lines(docs.win:get_buf(), 0, -1, true, doc_lines)
     vim.api.nvim_set_option_value('modified', false, { buf = docs.win:get_buf() })
 
-    docs.win:open()
+    if autocomplete.win:get_win() then
+      docs.win:open()
+      docs.win:update_position(autocomplete.win:get_win())
+    end
   end)
 end
 

lua/blink/cmp/windows/lib.lua

@@ -7,20 +7,13 @@ function win.new(config)
   self.config = {
     width = config.width or 40,
     max_height = config.max_height or 10,
-    relative = config.relative or 'cursor',
     cursorline = config.cursorline or false,
     wrap = config.wrap or false,
     filetype = config.filetype or 'cmp_menu',
     winhighlight = config.winhighlight or 'Normal:NormalFloat,FloatBorder:NormalFloat',
     padding = config.padding,
   }
 
-  if self.config.relative == 'cursor' then
-    vim.api.nvim_create_autocmd('CursorMovedI', {
-      callback = function() self:update_position() end,
-    })
-  end
-
   return self
 end
 
@@ -65,8 +58,6 @@ function win:open()
   vim.api.nvim_set_option_value('concealcursor', 'n', { win = self.id })
   vim.api.nvim_set_option_value('cursorlineopt', 'line', { win = self.id })
   vim.api.nvim_set_option_value('cursorline', self.config.cursorline, { win = self.id })
-
-  self:update_position()
 end
 
 function win:close()
@@ -77,7 +68,7 @@ function win:close()
 end
 
 -- todo: dynamic width
-function win:update_position()
+function win:update_position(relative_to)
   if not self:is_open() then return end
   local winnr = self:get_win()
   local config = self.config
@@ -94,7 +85,7 @@ function win:update_position()
   vim.api.nvim_win_set_height(winnr, height)
 
   -- relative to cursor
-  if config.relative == 'cursor' then
+  if relative_to == 'cursor' then
     local is_space_below = screen_height - cursor_row > height
 
     if is_space_below then
@@ -104,27 +95,27 @@ function win:update_position()
     end
 
   -- relative to window
-  elseif config.relative.id ~= nil then
-    local relative_win_config = vim.api.nvim_win_get_config(config.relative.id)
+  elseif type(relative_to) == 'number' then
+    local relative_win_config = vim.api.nvim_win_get_config(relative_to)
 
-    -- todo: why is there a -5 here?
-    local max_width_right = screen_width - cursor_col - relative_win_config.width - 5
+    -- todo: why is there a -7 here? probably the signcolumn stuff?
+    local max_width_right = screen_width - cursor_col - relative_win_config.width - 7
     local max_width_left = cursor_col
 
     local width = math.min(math.max(max_width_left, max_width_right), config.width)
 
     if max_width_right >= config.width or max_width_right >= max_width_left then
       vim.api.nvim_win_set_config(winnr, {
         relative = 'win',
-        win = config.relative.id,
+        win = relative_to,
         row = 0,
         col = relative_win_config.width,
         width = width,
       })
     else
       vim.api.nvim_win_set_config(winnr, {
         relative = 'win',
-        win = config.relative.id,
+        win = relative_to,
         row = 0,
         col = -width,
         width = width,