feat: support using suffix for fuzzy matching

closes #88

Author: Saghen

README.md

@@ -202,6 +202,10 @@ MiniDeps.add({
   },
 
   fuzzy = {
+    -- 'prefix' will fuzzy match on the text before the cursor
+    -- 'full' will fuzzy match on the text befor *and* after the cursor
+    -- example: 'foo_|_bar' will match 'foo_' for 'prefix' and 'foo__bar' for 'full'
+    keyword_range = 'prefix',
     -- frencency tracks the most recently/frequently used items and boosts the score of the item
     use_frecency = true,
     -- proximity bonus boosts the score of items with a value in the buffer

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

@@ -1,3 +1,4 @@
+local config = require('blink.cmp.config')
 local text_edits = {}
 
 function text_edits.get_from_item(item)
@@ -13,7 +14,7 @@ function text_edits.get_from_item(item)
   end
 
   -- No text edit so we fallback to our own resolution
-  return text_edits.guess_text_edit(vim.api.nvim_get_current_buf(), item)
+  return text_edits.guess_text_edit(item)
 end
 
 function text_edits.apply_text_edits(client_id, edits)
@@ -38,26 +39,17 @@ function text_edits.apply_additional_text_edits(item)
 end
 
 -- todo: doesnt work when the item contains characters not included in the context regex
-function text_edits.guess_text_edit(bufnr, item)
+function text_edits.guess_text_edit(item)
   local word = item.textEditText or item.insertText or item.label
 
+  local range = require('blink.cmp.utils').get_regex_around_cursor('[%w_\\-]', config.fuzzy.keyword_range)
   local current_line = vim.api.nvim_win_get_cursor(0)[1]
-  local current_col = vim.api.nvim_win_get_cursor(0)[2]
-  local line = vim.api.nvim_buf_get_lines(bufnr, current_line - 1, current_line, false)[1]
-
-  -- Search forward/backward for the start/end of the word
-  local start_col = current_col
-  while start_col > 0 do
-    local char = line:sub(start_col, start_col)
-    if char:match('[%w_\\-]') == nil then break end
-    start_col = start_col - 1
-  end
 
   -- convert to 0-index
   return {
     range = {
-      start = { line = current_line - 1, character = start_col },
-      ['end'] = { line = current_line - 1, character = current_col },
+      start = { line = current_line - 1, character = range[1] },
+      ['end'] = { line = current_line - 1, character = range[2] },
     },
     newText = word,
   }

lua/blink/cmp/config.lua

@@ -68,6 +68,7 @@
 --- @field forceVersion? string | nil
 
 --- @class blink.cmp.FuzzyConfig
+--- @field keyword_range? 'prefix' | 'full'
 --- @field use_frecency? boolean
 --- @field use_proximity? boolean
 --- @field max_items? number
@@ -207,6 +208,10 @@ local config = {
   },
 
   fuzzy = {
+    -- 'prefix' will fuzzy match on the text before the cursor
+    -- 'full' will fuzzy match on the text befor *and* after the cursor
+    -- example: 'foo_|_bar' will match 'foo_' for 'prefix' and 'foo__bar' for 'full'
+    keyword_range = 'prefix',
     -- frencency tracks the most recently/frequently used items and boosts the score of the item
     use_frecency = true,
     -- proximity bonus boosts the score of items with a value in the buffer

lua/blink/cmp/fuzzy/init.lua

@@ -1,4 +1,4 @@
-local config = require('blink.cmp.config').fuzzy
+local config = require('blink.cmp.config')
 
 local fuzzy = {
   ---@type blink.cmp.Context?
@@ -59,10 +59,10 @@ function fuzzy.filter_items(needle, items)
       -- so this should generally be good
       -- TODO: make this configurable
       min_score = 6 * needle:len(),
-      max_items = config.max_items,
-      use_frecency = config.use_frecency,
-      use_proximity = config.use_proximity,
-      sorts = config.sorts,
+      max_items = config.fuzzy.max_items,
+      use_frecency = config.fuzzy.use_frecency,
+      use_proximity = config.fuzzy.use_proximity,
+      sorts = config.fuzzy.sorts,
       nearby_words = nearby_words,
     })
 
@@ -88,18 +88,14 @@ function fuzzy.filter_items_with_cache(needle, context, items)
 end
 
 --- Gets the text under the cursor to be used for fuzzy matching
---- @param regex string | nil
 --- @return string
-function fuzzy.get_query(regex)
-  if regex == nil then regex = '[%w_\\-]+$' end
-
-  local bufnr = vim.api.nvim_get_current_buf()
-
-  local current_line = vim.api.nvim_win_get_cursor(0)[1] - 1
-  local current_col = vim.api.nvim_win_get_cursor(0)[2] - 1
-  local line = vim.api.nvim_buf_get_lines(bufnr, current_line, current_line + 1, false)[1]
-
-  return string.sub(line, 1, current_col + 1):match(regex) or ''
+function fuzzy.get_query()
+  local line = vim.api.nvim_get_current_line()
+  local range = require('blink.cmp.utils').get_regex_around_cursor(
+    config.trigger.completion.keyword_regex,
+    config.fuzzy.keyword_range
+  )
+  return string.sub(line, range[1] + 1, range[2] + 1)
 end
 
 return fuzzy

lua/blink/cmp/utils.lua

@@ -134,4 +134,33 @@ function utils.highlight_with_treesitter(bufnr, root_lang, start_line, end_line)
   end)
 end
 
+--- Gets characters around the cursor and returns the range, 0-indexed
+--- @param regex string
+--- @param range 'prefix' | 'full'
+--- @return number[]
+function utils.get_regex_around_cursor(regex, range)
+  local current_col = vim.api.nvim_win_get_cursor(0)[2]
+  local line = vim.api.nvim_get_current_line()
+
+  -- Search backward for the start of the word
+  local start_col = current_col
+  while start_col > 0 do
+    local char = line:sub(start_col, start_col)
+    if char:match(regex) == nil then break end
+    start_col = start_col - 1
+  end
+
+  if range == 'prefix' then return { start_col, current_col } end
+
+  -- Search forward for the end of the word
+  local end_col = current_col
+  while end_col < #line do
+    local char = line:sub(end_col + 1, end_col + 1)
+    if char:match(regex) == nil then break end
+    end_col = end_col + 1
+  end
+
+  return { start_col, end_col }
+end
+
 return utils