feat: check for brackets in front of item

Author: Saghen

lua/blink/cmp/accept/brackets.lua

@@ -39,22 +39,28 @@ local brackets = {
 --- @param item blink.cmp.CompletionItem
 --- @return 'added' | 'check_semantic_token' | 'skipped', lsp.TextEdit | lsp.InsertReplaceEdit, number
 function brackets.add_brackets(filetype, item)
-  if not brackets.should_run_resolution(filetype, 'kind') then return 'check_semantic_token', item.textEdit, 0 end
+  local text_edit = item.textEdit
+  assert(text_edit ~= nil, 'Got nil text edit while adding brackets via kind')
+  local brackets_for_filetype = brackets.get_for_filetype(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 brackets.has_brackets_in_front(text_edit, brackets_for_filetype[1]) then
+    return 'skipped', text_edit, #brackets_for_filetype[1]
+  end
+  -- check if configuration incidates we should skip
+  if not brackets.should_run_resolution(filetype, 'kind') then return 'check_semantic_token', text_edit, 0 end
   -- not a function, skip
   if
     item.kind ~= vim.lsp.protocol.CompletionItemKind.Function
     and item.kind ~= vim.lsp.protocol.CompletionItemKind.Method
   then
-    return 'check_semantic_token', item.textEdit, 0
+    return 'check_semantic_token', text_edit, 0
   end
 
-  local brackets_for_filetype = brackets.get_for_filetype(filetype, item)
-  local text_edit = item.textEdit
-  assert(text_edit ~= nil, 'Got nil text edit while adding brackets via kind')
-
-  -- if already contains the brackets, conservatively skip adding brackets
+  -- if the item already contains the brackets, conservatively skip adding brackets
   -- todo: won't work for snippets when the brackets_for_filetype is { '{', '}' }
+  -- I've never seen a language like that though
   if brackets_for_filetype[1] ~= ' ' and text_edit.newText:match('[\\' .. brackets_for_filetype[1] .. ']') ~= nil then
     return 'skipped', text_edit, 0
   end
@@ -171,4 +177,13 @@ function brackets.should_run_resolution(filetype, resolution_method)
   return not vim.tbl_contains(config.blocked_filetypes, filetype)
 end
 
+--- @param text_edit lsp.TextEdit | lsp.InsertReplaceEdit
+--- @param bracket string
+--- @return boolean
+function brackets.has_brackets_in_front(text_edit, bracket)
+  local line = vim.api.nvim_get_current_line()
+  local col = text_edit.range['end'].character + 1
+  return line:sub(col, col) == bracket
+end
+
 return brackets

lua/blink/cmp/accept/init.lua

@@ -5,18 +5,7 @@ local brackets_lib = require('blink.cmp.accept.brackets')
 --- @param item blink.cmp.CompletionItem
 local function accept(item)
   item = vim.deepcopy(item)
-
-  -- Adjust the position of the text edit to be the current cursor position
-  -- since the data might be outdated. We compare the cursor column position
-  -- from when the items were fetched versus the current.
-  -- hack: figure out a better way
-  if item.textEdit ~= nil then
-    local offset = vim.api.nvim_win_get_cursor(0)[2] - item.cursor_column
-    item.textEdit.range['end'].character = item.textEdit.range['end'].character + offset
-  -- No text edit so we fallback to our own resolution
-  else
-    item.textEdit = text_edits_lib.guess_text_edit(vim.api.nvim_get_current_buf(), item)
-  end
+  item.textEdit = text_edits_lib.get_from_item(item)
 
   -- Add brackets to the text edit if needed
   local brackets_status, text_edit_with_brackets, offset = brackets_lib.add_brackets(vim.bo.filetype, item)

lua/blink/cmp/accept/text-edits.lua

@@ -1,5 +1,22 @@
+local utils = require('blink.cmp.utils')
 local text_edits = {}
 
+function text_edits.get_from_item(item)
+  -- Adjust the position of the text edit to be the current cursor position
+  -- since the data might be outdated. We compare the cursor column position
+  -- from when the items were fetched versus the current.
+  -- hack: is there a better way?
+  if item.textEdit ~= nil then
+    local text_edit = utils.shallow_copy(item.textEdit)
+    local offset = vim.api.nvim_win_get_cursor(0)[2] - item.cursor_column
+    text_edit.range['end'].character = text_edit.range['end'].character + offset
+    return text_edit
+  end
+
+  -- No text edit so we fallback to our own resolution
+  return text_edits.guess_text_edit(vim.api.nvim_get_current_buf(), item)
+end
+
 function text_edits.apply_text_edits(client_id, edits)
   local client = vim.lsp.get_client_by_id(client_id)
   local offset_encoding = client ~= nil and client.offset_encoding or 'utf-16'