feat: ignore some characters at prefix of keyword

closes #135

Author: Saghen

README.md

@@ -182,10 +182,16 @@ MiniDeps.add({
 
   trigger = {
     completion = {
+      -- 'prefix' will fuzzy match on the text before the cursor
+      -- 'full' will fuzzy match on the text before *and* after the cursor
+      -- example: 'foo_|_bar' will match 'foo_' for 'prefix' and 'foo__bar' for 'full'
+      keyword_range = 'prefix',
       -- regex used to get the text when fuzzy matching
       -- changing this may break some sources, so please report if you run into issues
       -- todo: shouldnt this also affect the accept command? should this also be per language?
       keyword_regex = '[%w_\\-]',
+      -- after matching with keyword_regex, any characters matching this regex at the prefix will be excluded
+      exclude_from_prefix_regex = '[\\-]',
       -- LSPs can indicate when to show the completion window via trigger characters
       -- however, some LSPs (*cough* tsserver *cough*) return characters that would essentially
       -- always show the window. We block these by default
@@ -206,10 +212,6 @@ MiniDeps.add({
   },
 
   fuzzy = {
-    -- 'prefix' will fuzzy match on the text before the cursor
-    -- 'full' will fuzzy match on the text before *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

@@ -61,7 +61,12 @@ end
 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 cmp_config = config.trigger.completion
+  local range = require('blink.cmp.utils').get_regex_around_cursor(
+    cmp_config.keyword_range,
+    cmp_config.keyword_regex,
+    cmp_config.exclude_from_prefix_regex
+  )
   local current_line = vim.api.nvim_win_get_cursor(0)[1]
 
   -- convert to 0-index

lua/blink/cmp/config.lua

@@ -31,7 +31,9 @@
 --- @field timeout_ms? number How long to wait for semantic tokens to return before assuming no brackets should be added
 
 --- @class blink.cmp.CompletionTriggerConfig
+--- @field keyword_range? 'prefix' | 'full'
 --- @field keyword_regex? string
+--- @field exclude_from_prefix_regex? string
 --- @field blocked_trigger_characters? string[]
 --- @field show_on_insert_on_trigger_character? boolean When true, will show the completion window when the cursor comes after a trigger character when entering insert mode
 --- @field show_on_insert_blocked_trigger_characters? string[] List of additional trigger characters that won't trigger the completion window when the cursor comes after a trigger character when entering insert mode
@@ -68,7 +70,6 @@
 --- @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
@@ -184,10 +185,16 @@ local config = {
 
   trigger = {
     completion = {
+      -- 'prefix' will fuzzy match on the text before the cursor
+      -- 'full' will fuzzy match on the text before *and* after the cursor
+      -- example: 'foo_|_bar' will match 'foo_' for 'prefix' and 'foo__bar' for 'full'
+      keyword_range = 'prefix',
       -- regex used to get the text when fuzzy matching
       -- changing this may break some sources, so please report if you run into issues
       -- todo: shouldnt this also affect the accept command? should this also be per language?
       keyword_regex = '[%w_\\-]',
+      -- after matching with keyword_regex, any characters matching this regex at the prefix will be excluded
+      exclude_from_prefix_regex = '[\\-]',
       -- LSPs can indicate when to show the completion window via trigger characters
       -- however, some LSPs (*cough* tsserver *cough*) return characters that would essentially
       -- always show the window. We block these by default
@@ -208,10 +215,6 @@ local config = {
   },
 
   fuzzy = {
-    -- 'prefix' will fuzzy match on the text before the cursor
-    -- 'full' will fuzzy match on the text before *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

@@ -91,10 +91,13 @@ end
 --- @return string
 function fuzzy.get_query()
   local line = vim.api.nvim_get_current_line()
+  local cmp_config = config.trigger.completion
   local range = require('blink.cmp.utils').get_regex_around_cursor(
-    config.trigger.completion.keyword_regex,
-    config.fuzzy.keyword_range
+    cmp_config.keyword_range,
+    cmp_config.keyword_regex,
+    cmp_config.exclude_from_prefix_regex
   )
+  vim.print(range)
   return string.sub(line, range[1] + 1, range[2] + 1)
 end
 

lua/blink/cmp/utils.lua

@@ -136,10 +136,11 @@ function utils.highlight_with_treesitter(bufnr, filetype, start_line, end_line)
 end
 
 --- Gets characters around the cursor and returns the range, 0-indexed
---- @param regex string
 --- @param range 'prefix' | 'full'
+--- @param regex string
+--- @param exclude_from_prefix_regex string
 --- @return number[]
-function utils.get_regex_around_cursor(regex, range)
+function utils.get_regex_around_cursor(range, regex, exclude_from_prefix_regex)
   local current_col = vim.api.nvim_win_get_cursor(0)[2]
   local line = vim.api.nvim_get_current_line()
 
@@ -151,14 +152,24 @@ function utils.get_regex_around_cursor(regex, range)
     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
+
+  -- Search forward for the end of the word if configured
+  if range == 'full' then
+    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
+  end
+
+  -- exclude characters matching exclude_prefix_regex from the beginning of the bounds
+  if exclude_from_prefix_regex ~= nil then
+    while start_col <= end_col do
+      local char = line:sub(start_col + 1, start_col + 1)
+      if char:match(exclude_from_prefix_regex) == nil then break end
+      start_col = start_col + 1
+    end
   end
 
   return { start_col, end_col }