Check for unescaped trailing \ when reparsing a MultiPattern

helix-editor · Dec 9, 2024 · 387b17c · 387b17c
1 parent d17e29a
commit 387b17c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/src/pattern.rs b/src/pattern.rs
@@ -52,11 +52,19 @@ impl MultiPattern {
         let old_status = self.cols[column].1;
         if append
             && old_status != Status::Rescore
-            && self.cols[column]
-                .0
-                .atoms
-                .last()
-                .map_or(true, |last| !last.negative)
+                // must be rescored if the atom is negative or if there is an unescaped
+                // trailing `\`
+            && self.cols[column].0.atoms.last().map_or(true, |last| {
+                !last.negative
+                    && last
+                        .needle_text()
+                        .chars()
+                        .rev()
+                        .take_while(|c| *c == '\\')
+                        .count()
+                        % 2
+                        == 0
+            })
         {
             self.cols[column].1 = Status::Update;
         } else {

diff --git a/src/pattern/tests.rs b/src/pattern/tests.rs
@@ -11,4 +11,24 @@ fn append() {
     assert_eq!(pat.status(), Status::Update);
     pat.reparse(0, "!fo", CaseMatching::Smart, Normalization::Smart, true);
     assert_eq!(pat.status(), Status::Rescore);
+
+    let mut pat = MultiPattern::new(1);
+    pat.reparse(0, "a\\\\", CaseMatching::Smart, Normalization::Smart, true);
+    assert_eq!(pat.status(), Status::Update);
+    pat.reparse(
+        0,
+        "a\\\\\\",
+        CaseMatching::Smart,
+        Normalization::Smart,
+        true,
+    );
+    assert_eq!(pat.status(), Status::Update);
+    pat.reparse(
+        0,
+        "a\\\\\\\\",
+        CaseMatching::Smart,
+        Normalization::Smart,
+        true,
+    );
+    assert_eq!(pat.status(), Status::Rescore);
 }