feat: prefer continuous matches (#1888)

* feat: bump frizbee to 0.4.3

* feat: adjust lua scoring to match frizbee

* fix: lua fuzzy match assertions

Author: Saghen

Cargo.lock

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 regex = "1.11.1"
-frizbee = "0.4.1"
+frizbee = "0.4.3"
 serde = { version = "1.0.216", features = ["derive"] }
 heed = "0.21.0"
 mlua = { version = "0.10.2", features = ["module", "luajit"] }

Cargo.toml

@@ -1,14 +1,15 @@
-local MATCH_SCORE = 7
-local GAP_PENALTY = -1
+local MATCH_SCORE = 12
+local GAP_OPEN_PENALTY = -5
+local GAP_EXTEND_PENALTY = -1
 
 -- bonus for matching the first character of the haystack
-local PREFIX_BONUS = 6
+local PREFIX_BONUS = 12
 -- bonus for matching character after a delimiter in the haystack (e.g. space, comma, underscore, slash, etc)
 local DELIMITER_BONUS = 4
 -- bonus for haystack == needle
 local EXACT_MATCH_BONUS = 4
 -- bonus for matching the case (upper or lower) of the haystack
-local MATCHING_CASE_BONUS = 1
+local MATCHING_CASE_BONUS = 4
 
 local DELIMITERS = {
   [string.byte(' ', 1)] = true,
@@ -43,7 +44,10 @@ local function match(needle, haystack)
         score = score + MATCH_SCORE
 
         -- gap penalty
-        if needle_idx ~= 1 then score = score + GAP_PENALTY * (haystack_idx - haystack_start_idx) end
+        if needle_idx ~= 1 then
+          local gap_length = haystack_idx - haystack_start_idx
+          if gap_length > 0 then score = score + GAP_OPEN_PENALTY + GAP_EXTEND_PENALTY * (gap_length - 1) end
+        end
 
         -- bonuses
         if needle_char == haystack_char then score = score + MATCHING_CASE_BONUS end
@@ -69,10 +73,10 @@ local function match(needle, haystack)
   return score, exact
 end
 
-assert(match('fbb', 'barbazfoobarbaz') == 20, 'fbb should match barbazfoobarbaz with score 18')
-assert(match('foo', '_foobar') == 28, 'foo should match foobar with score 29')
-assert(match('Foo', 'foobar') == 29, 'foo should match foobar with score 29')
-assert(match('foo', 'foobar') == 30, 'foo should match foobar with score 30')
+assert(match('fbb', 'barbazfoobarbaz') == 36, 'fbb should match barbazfoobarbaz with score 36')
+assert(match('foo', '_foobar') == 52, 'foo should match foobar with score 52')
+assert(match('Foo', 'foobar') == 56, 'foo should match foobar with score 56')
+assert(match('foo', 'foobar') == 60, 'foo should match foobar with score 60')
 assert(match('foo', 'fobar') == nil, 'foo should not match fobar')
 
 return match