From a32735b9e8513bd71d82744597490ac10e343c6e Mon Sep 17 00:00:00 2001
From: Glenn Waters <glenn@watrs.ca>
Date: Mon, 20 Oct 2025 11:50:18 -0400
Subject: [PATCH] fix(picker.core): respect camelCase for scoring when
 ignorecase is true (#1601)

## Description

<!-- Describe the big picture of your changes to communicate to the
maintainers
  why we should accept this pull request. -->
Because the search item was lowercased before it was scored, camelCase
would not be triggered to give the intended bonus.

This was the simplest and fastest (code execution wise) fix I could see.

## Related Issue(s)
Fixes: https://github.com/folke/snacks.nvim/issues/1599

## Screenshots

<!-- Add screenshots of the changes if applicable. -->
---
 lua/snacks/picker/core/matcher.lua | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lua/snacks/picker/core/matcher.lua b/lua/snacks/picker/core/matcher.lua
index caa59d96..944913ad 100644
--- a/lua/snacks/picker/core/matcher.lua
+++ b/lua/snacks/picker/core/matcher.lua
@@ -484,7 +484,7 @@ function M:_match(item, mods)
   str = mods.ignorecase and str:lower() or str
   local from, to ---@type number?, number?
   if mods.fuzzy then
-    return self:fuzzy(str, mods.chars)
+    return self:fuzzy(str, str_orig, mods.chars)
   end
   if mods.exact_prefix then
     if str:sub(1, #mods.pattern) == mods.pattern then
@@ -519,15 +519,16 @@ function M:_match(item, mods)
 end
 
 ---@param str string
+---@param str_orig string
 ---@param pattern string[]
 ---@param init? number
 ---@return number? from, number? to
-function M:fuzzy_find(str, pattern, init)
+function M:fuzzy_find(str, str_orig, pattern, init)
   local from = string.find(str, pattern[1], init or 1, true)
   if not from then
     return
   end
-  self.score:init(str, from)
+  self.score:init(str_orig, from)
   ---@type number?, number
   local last, n = from, #pattern
   for i = 2, n do
@@ -544,10 +545,11 @@ end
 --- Does a forward scan followed by a backward scan for each end position,
 --- to find the best match.
 ---@param str string
+---@param str_orig string
 ---@param pattern string[]
 ---@return number? score, number? from, number? to, string? str
-function M:fuzzy(str, pattern)
-  local from, to = self:fuzzy_find(str, pattern)
+function M:fuzzy(str, str_orig, pattern)
+  local from, to = self:fuzzy_find(str, str_orig, pattern)
   if not from then
     return
   end
@@ -558,7 +560,7 @@ function M:fuzzy(str, pattern)
     if self.score.score > best_score then
       best_from, best_to, best_score = from, to, self.score.score
     end
-    from, to = self:fuzzy_find(str, pattern, from + 1)
+    from, to = self:fuzzy_find(str, str_orig, pattern, from + 1)
   end
   return best_score, best_from, best_to, str
 end