fix: use sum of scores in And engine

Author: LoricAndre

src/engine/andor.rs

@@ -82,7 +82,7 @@ impl AndEngine {
                     ranges.extend(vec.iter().copied());
                 }
             }
-            rank.score = rank.score.max(item.rank.score);
+            rank.score = rank.score.saturating_add(item.rank.score);
             rank.begin = rank.begin.min(item.rank.begin);
             rank.end = rank.end.max(item.rank.end);
         }

src/fuzzy_matcher/arinae/constants.rs

@@ -21,7 +21,7 @@ pub(super) const GAP_OPEN: Score = 6;
 /// Cost to extend a gap by one more character.
 pub(super) const GAP_EXTEND: Score = 2;
 
-pub(super) const TYPO_PENALTY: Score = 8;
+pub(super) const TYPO_PENALTY: Score = 10;
 
 /// Penalty for aligning a pattern char to a different choice char (typos only).
 pub(super) const MISMATCH_PENALTY: Score = 16;

src/fuzzy_matcher/arinae/tests.rs

@@ -396,8 +396,10 @@ fn typo_prefilter_no_false_negative_on_extension() {
 fn use_last_match_prefers_later_occurrence() {
     // "man/man1/sk.1" contains "man" at indices 0..=2 and again at 4..=6.
     // With use_last_match=true, the matcher should highlight the second one.
-    let mut m = ArinaeMatcher::default();
-    m.use_last_match = true;
+    let m = ArinaeMatcher {
+        use_last_match: true,
+        ..Default::default()
+    };
     let (_, got) = m.fuzzy_indices("man/man1/sk.1", "man").expect("should match");
     assert_eq!(got, vec![4, 5, 6], "expected second 'man' (indices 4,5,6), got {got:?}");
 }

src/item.rs

@@ -53,9 +53,7 @@ impl RankBuilder {
     /// Computes the byte offset of the first character after the last path separator
     /// (`/` or `\`) in `text`.  Returns `0` when no separator is present.
     fn path_name_offset(text: &str) -> i32 {
-        text.rfind(|c| c == '/' || c == '\\')
-            .map(|pos| pos as i32 + 1)
-            .unwrap_or(0)
+        text.rfind(['/', '\\']).map(|pos| pos as i32 + 1).unwrap_or(0)
     }
 
     /// Builds a `Rank` from raw match measurements.

tests/snapshots/matcher__matcher_arinae_typos.snap

@@ -2,8 +2,8 @@
 source: tests/matcher.rs
 expression: buf + & cursor_pos
 ---
-"  src/manpage.rs                                                                "
 "  src/util.rs                                                                   "
+"  src/skim_item.rs                                                              "
 "  src/item.rs                                                                   "
 "  src/fuzzy_matcher/clangd.rs                                                   "
 "  src/fuzzy_matcher/frizbee.rs                                                  "
@@ -24,6 +24,6 @@ expression: buf + & cursor_pos
 "  src/tui/util.rs                                                               "
 "  src/tui/item_list.rs                                                          "
 "> src/tui/mod.rs                                                                "
-"  38/49                                                                      0/0"
+"  39/49                                                                      0/0"
 "> stum                                                                          "
 cursor: (24, 7)