fix(accept/brackets): respect item.kind when moving cursor (#779)

* chore(gitignore): add `.lazy.lua`

* fix(accept/brackets): respect `item.kind` when moving cursor

* refactor: respect `item.kind` when moving cursor

---------

Co-authored-by: Liam Dyer <[email protected]>

.gitignore

@@ -1,6 +1,7 @@
 target/
 .archive.lua
 _*.lua
+.lazy.lua
 dual/
 result
 .direnv

lua/blink/cmp/completion/brackets/kind.lua

@@ -15,7 +15,8 @@ local function add_brackets(ctx, filetype, item)
   -- if there's already the correct brackets in front, skip but indicate the cursor should move in front of the bracket
   -- TODO: what if the brackets_for_filetype[1] == '' or ' ' (haskell/ocaml)?
   if utils.has_brackets_in_front(text_edit, brackets_for_filetype[1]) then
-    return 'skipped', text_edit, #brackets_for_filetype[1]
+    local offset = utils.can_have_brackets(item, brackets_for_filetype) and #brackets_for_filetype[1] or 0
+    return 'skipped', text_edit, offset
   end
 
   -- if the item already contains the brackets, conservatively skip adding brackets
@@ -27,11 +28,8 @@ local function add_brackets(ctx, filetype, item)
 
   -- check if configuration incidates we should skip
   if not utils.should_run_resolution(filetype, 'kind') then return 'check_semantic_token', text_edit, 0 end
-  -- not a function, skip
-  local CompletionItemKind = require('blink.cmp.types').CompletionItemKind
-  if item.kind ~= CompletionItemKind.Function and item.kind ~= CompletionItemKind.Method then
-    return 'check_semantic_token', text_edit, 0
-  end
+  -- cannot have brackets, skip
+  if not utils.can_have_brackets(item, brackets_for_filetype) then return 'check_semantic_token', text_edit, 0 end
 
   text_edit = vim.deepcopy(text_edit)
   -- For snippets, we add the cursor position between the brackets as the last placeholder

lua/blink/cmp/completion/brackets/utils.lua

@@ -1,4 +1,5 @@
 local config = require('blink.cmp.config').completion.accept.auto_brackets
+local CompletionItemKind = require('blink.cmp.types').CompletionItemKind
 local brackets = require('blink.cmp.completion.brackets.config')
 local utils = {}
 
@@ -50,4 +51,11 @@ function utils.has_brackets_in_front(text_edit, bracket)
   return line:sub(col, col) == bracket
 end
 
+--- @param item blink.cmp.CompletionItem
+--- @param _ string[]
+-- TODO: for edge cases, we should probably also take brackets themselves into consideration
+function utils.can_have_brackets(item, _)
+  return item.kind == CompletionItemKind.Function or item.kind == CompletionItemKind.Method
+end
+
 return utils