Merge https://github.com/Saghen/blink.cmp into preselect-option

Author: BrianNormant

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

@@ -49,15 +49,14 @@ function text_edits.guess_text_edit(bufnr, item)
   -- Search forward/backward for the start/end of the word
   local start_col = current_col
   while start_col > 1 do
-    local char = line:sub(start_col, start_col)
-    if char:match('[%w_\\-]') == nil then
-      start_col = start_col + 1
-      break
-    end
+    local char = line:sub(start_col - 1, start_col - 1)
+    if char:match('[%w_\\-]') == nil then break end
     start_col = start_col - 1
   end
 
-  -- todo: dont search forward since LSPs dont typically do this so it will be inconsistent
+  -- todo: optionally dont search forward since LSPs dont typically do this with textEdits
+  -- so this will lead to inconsistent behavior
+  -- OR add support on textEdits
   local end_col = current_col
   while end_col < #line do
     local char = line:sub(end_col + 1, end_col + 1)

lua/blink/cmp/init.lua

@@ -75,7 +75,7 @@ cmp.setup_signature_help = function()
   signature_trigger.listen_on_show(function(context)
     cmp.sources.cancel_signature_help()
     cmp.sources.get_signature_help(context, function(signature_help)
-      if signature_help ~= nil and signature_trigger.context.id == context.id then
+      if signature_help ~= nil and signature_trigger.context ~= nil and signature_trigger.context.id == context.id then
         signature_trigger.set_active_signature_help(signature_help)
         signature_window.open_with_signature_help(context, signature_help)
       else

lua/blink/cmp/sources/snippets/init.lua

@@ -1,11 +1,10 @@
 --- @class blink.cmp.SnippetsOpts
---- @param friendly_snippets boolean
---- @param search_paths string[]
---- @param global_snippets string[]
---- @param extended_filetypes table<string, string[]>
---- @param ignored_filetypes string[]
+--- @field friendly_snippets boolean
+--- @field search_paths string[]
+--- @field global_snippets string[]
+--- @field extended_filetypes table<string, string[]>
+--- @field ignored_filetypes string[]
 
-local utils = require('blink.cmp.utils')
 local snippets = {}
 
 --- @param opts blink.cmp.SnippetsOpts
@@ -29,27 +28,24 @@ function snippets:get_completions(_, callback)
 
     self.cache[filetype] = {}
     for _, snippet in pairs(snips) do
-      table.insert(self.cache[filetype], self.registry:snippet_to_completion_item(snippet))
+      table.insert(self.cache[filetype], snippet)
     end
   end
 
-  local copied_items = vim.tbl_map(function(item) return utils.shallow_copy(item) end, self.cache[filetype])
+  local items = vim.tbl_map(
+    function(item) return self.registry:snippet_to_completion_item(item) end,
+    self.cache[filetype]
+  )
   callback({
     is_incomplete_forward = false,
     is_incomplete_backward = false,
-    items = copied_items,
+    items = items,
   })
 end
 
 function snippets:resolve(item, callback)
   -- TODO: ideally context is passed with the filetype
-  local documentation = '```'
-    .. vim.bo.filetype
-    .. '\n'
-    .. self.registry:preview(item.insertText)
-    .. '```'
-    .. '\n---\n'
-    .. item.description
+  local documentation = '```' .. vim.bo.filetype .. '\n' .. item.insertText .. '```' .. '\n---\n' .. item.description
 
   local resolved_item = vim.deepcopy(item)
   resolved_item.documentation = {

lua/blink/cmp/sources/snippets/registry.lua

@@ -103,22 +103,21 @@ function registry:get_global_snippets()
 end
 
 --- @param snippet blink.cmp.Snippet
---- @param filetype string
---- @param include_documentation boolean
 --- @return blink.cmp.CompletionItem
 function registry:snippet_to_completion_item(snippet)
+  local body = type(snippet.body) == 'string' and snippet.body or table.concat(snippet.body, '\n')
   return {
     kind = vim.lsp.protocol.CompletionItemKind.Snippet,
     label = snippet.prefix,
     insertTextFormat = vim.lsp.protocol.InsertTextFormat.Snippet,
-    insertText = type(snippet.body) == 'string' and snippet.body or table.concat(snippet.body, '\n'),
+    insertText = self:parse_body(body),
     description = snippet.description,
   }
 end
 
 --- @param snippet string
 --- @return string
-function registry:preview(snippet)
+function registry:parse_body(snippet)
   local parse = utils.safe_parse(self:expand_vars(snippet))
   return parse and tostring(parse) or snippet
 end