feat: smarter fuzzy, drop logging

Author: Saghen

Cargo.lock

@@ -48,7 +48,7 @@
                 "c-marshalling-0.2.0" =
                   "sha256-eL6nkZOtuLLQ0r31X7uroUUDYZsWOJ9KNXl4NCVNRuw=";
                 "frizbee-0.1.0" =
-                  "sha256-FHyf5WqYCKVwbSZJ/Qg4aP+FHWsEORvPndRo5wHv+rU=";
+                  "sha256-ksiB8R97z+heM6Ynh3D9Rf+pMhEPqncomgTXT2n5byQ=";
               };
             };
           };

flake.nix

@@ -67,6 +67,14 @@ pub fn fuzzy(
         })
         .collect::<Vec<_>>();
 
+    // Find the highest score and filter out matches that are unreasonably lower than it
+    let max_score = matches.iter().map(|mtch| mtch.score).max().unwrap_or(0);
+    let secondary_min_score = max_score.max(4) - 4;
+    matches = matches
+        .into_iter()
+        .filter(|mtch| mtch.score >= secondary_min_score)
+        .collect::<Vec<_>>();
+
     // Sort matches by sort criteria
     for sort in opts.sorts.iter() {
         match sort.as_str() {

lua/blink/cmp/fuzzy/fuzzy.rs

@@ -45,7 +45,7 @@ function fuzzy.filter_items(needle, items)
       -- each matching char is worth 4 points and it receives a bonus for capitalization, delimiter and prefix
       -- so this should generally be good
       -- TODO: make this configurable
-      min_score = 4 * needle:len(),
+      min_score = 6 * needle:len(),
       max_items = config.max_items,
       use_frecency = config.use_frecency,
       use_proximity = config.use_proximity,

lua/blink/cmp/fuzzy/init.lua

@@ -26,11 +26,11 @@ function sources_context:get_completions(context)
   assert(context.id == self.id, 'Requested completions on a sources context with a different context ID')
 
   if self.active_request ~= nil and self.active_request.status == async.STATUS.RUNNING then
-    vim.print(tostring(context.id) .. ': queued request | col: ' .. context.bounds.end_col)
+    -- vim.print(tostring(context.id) .. ': queued request | col: ' .. context.bounds.end_col)
     self.queued_request_context = context
     return
   end
-  vim.print(tostring(context.id) .. ': running request | col: ' .. context.bounds.end_col)
+  -- vim.print(tostring(context.id) .. ': running request | col: ' .. context.bounds.end_col)
 
   -- Create a task to get the completions for the first sources group,
   -- falling back to the next sources group iteratively if there are no items
@@ -50,6 +50,9 @@ function sources_context:get_completions(context)
     self.last_successful_completions = items
     self.on_completions_callback(context, items)
 
+    -- todo: when the queued request results in 100% cached content, we end up
+    -- calling the on_completions_callback with the same data, which triggers
+    -- unnecessary fuzzy + render updates
     if self.queued_request_context ~= nil then
       local queued_context = self.queued_request_context
       self.queued_request_context = nil
@@ -99,7 +102,7 @@ function sources_context:get_completions_for_group(sources_group, context)
       return items
     end)
     :catch(function(err)
-      vim.print('failed to get completions with error: ' .. err)
+      vim.print('failed to get completions for group with error: ' .. err)
       return { is_incomplete_forward = false, is_incomplete_backward = false, items = {} }
     end)
 end

lua/blink/cmp/sources/lib/context.lua

@@ -29,11 +29,11 @@ function source:get_completions(context)
   -- and the data doesn't need to be updated
   if self.last_response ~= nil and self.last_response.context.id == context.id then
     if utils.should_run_request(context, self.last_response) == false then
-      vim.print(self.name .. ': returning cached completions')
+      -- vim.print(self.name .. ': returning cached completions')
       return async.task.new(function(resolve) resolve(self.last_response) end)
     end
   end
-  vim.print(self.name .. ': running completions request')
+  -- vim.print(self.name .. ': running completions request')
 
   return async.task
     .new(function(resolve) return self.module:get_completions(context, resolve) end)

lua/blink/cmp/sources/lib/source.lua

@@ -33,7 +33,6 @@ function snippets:get_completions(context, callback)
     for _, snippet in pairs(snips) do
       table.insert(self.cache[filetype], self.registry:snippet_to_completion_item(snippet))
     end
-    vim.print(self.cache[filetype])
   end
 
   callback({

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

@@ -4,7 +4,7 @@
 
 ---@class blink.cmp.Snippet
 ---@field prefix string
----@field body string[]
+---@field body string[] | string
 ---@field description? string
 
 local registry = {
@@ -111,7 +111,7 @@ function registry:snippet_to_completion_item(snippet)
     kind = vim.lsp.protocol.CompletionItemKind.Snippet,
     label = snippet.prefix,
     insertTextFormat = vim.lsp.protocol.InsertTextFormat.Snippet,
-    insertText = table.concat(snippet.body, '\n'),
+    insertText = type(snippet.body) == 'string' and snippet.body or table.concat(snippet.body, '\n'),
     description = snippet.description,
   }
 end