From a25fcfdfa7116ad21d3fdc38f0be0297aed5119d Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 20 Sep 2023 16:30:45 -0600
Subject: [PATCH] Iron out some edge-cases

---
 Cargo.toml                                    |  1 +
 crates/search/src/buffer_search.rs            |  3 ++
 crates/vim/src/command.rs                     |  3 ++
 crates/vim/src/normal/search.rs               | 31 ++++++-------------
 .../vim/test_data/test_command_replace.json   |  7 +++++
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c1876434ad46fc7f8c5eddf59d46255fcde4136e..3e4c5911ed644014bc70aef383d357b5552c67d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -158,6 +158,7 @@ core-graphics = { git = "https://github.com/servo/core-foundation-rs", rev = "07
 
 [profile.dev]
 split-debuginfo = "unpacked"
+panic = "abort"
 
 [profile.release]
 debug = true
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 97f9d7a7c8f44f2d78e3b362d5f2878c3002a492..11c35a6d75cd50cada606dbc52617d7441c56d0e 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -702,6 +702,9 @@ impl BufferSearchBar {
                 .searchable_items_with_matches
                 .get(&searchable_item.downgrade())
             {
+                if matches.len() == 0 {
+                    return;
+                }
                 let new_match_index = matches.len() - 1;
                 searchable_item.update_matches(matches, cx);
                 searchable_item.activate_match(new_match_index, matches, cx);
diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs
index 10c2599dd9af76d98792898e33a97af1695bf4ac..7aaf3d8024acea6e5826fabaf08ae9a955105fca 100644
--- a/crates/vim/src/command.rs
+++ b/crates/vim/src/command.rs
@@ -355,6 +355,9 @@ mod test {
             dd
             ˇcc"})
             .await;
+
+        cx.simulate_shared_keystrokes([":", "%", "s", "/", "/", "/", "enter"])
+            .await;
     }
 
     #[gpui::test]
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index a9e5e66b9e1bef7d31a764067bf9e37e13823756..8ef0718c326dc660fb064e492ca35d1faadaa062 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -1,7 +1,7 @@
 use gpui::{actions, impl_actions, AppContext, ViewContext};
 use search::{buffer_search, BufferSearchBar, SearchMode, SearchOptions};
 use serde_derive::Deserialize;
-use workspace::{searchable::Direction, Pane, Toast, Workspace};
+use workspace::{searchable::Direction, Pane, Workspace};
 
 use crate::{motion::Motion, normal::move_cursor, state::SearchState, Vim};
 
@@ -36,7 +36,7 @@ pub struct ReplaceCommand {
     pub query: String,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 struct Replacement {
     search: String,
     replacement: String,
@@ -212,15 +212,7 @@ fn replace_command(
     action: &ReplaceCommand,
     cx: &mut ViewContext<Workspace>,
 ) {
-    let replacement = match parse_replace_all(&action.query) {
-        Ok(replacement) => replacement,
-        Err(message) => {
-            cx.handle().update(cx, |workspace, cx| {
-                workspace.show_toast(Toast::new(1544, message), cx)
-            });
-            return;
-        }
-    };
+    let replacement = parse_replace_all(&action.query);
     let pane = workspace.active_pane().clone();
     pane.update(cx, |pane, cx| {
         if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
@@ -270,18 +262,15 @@ fn replace_command(
     })
 }
 
-fn parse_replace_all(query: &str) -> Result<Replacement, String> {
+fn parse_replace_all(query: &str) -> Replacement {
     let mut chars = query.chars();
     if Some('%') != chars.next() || Some('s') != chars.next() {
-        return Err("unsupported pattern".to_string());
+        return Replacement::default();
     }
 
     let Some(delimeter) = chars.next() else {
-        return Err("unsupported pattern".to_string());
+        return Replacement::default();
     };
-    if delimeter == '\\' || !delimeter.is_ascii_punctuation() {
-        return Err(format!("cannot use {:?} as a search delimeter", delimeter));
-    }
 
     let mut search = String::new();
     let mut replacement = String::new();
@@ -315,7 +304,7 @@ fn parse_replace_all(query: &str) -> Result<Replacement, String> {
                 buffer = &mut flags;
                 phase = 2;
             } else {
-                return Err("trailing characters".to_string());
+                break;
             }
         } else {
             buffer.push(c)
@@ -331,14 +320,14 @@ fn parse_replace_all(query: &str) -> Result<Replacement, String> {
 
     for c in flags.chars() {
         match c {
-            'g' | 'I' => {} // defaults,
+            'g' | 'I' => {}
             'c' | 'n' => replacement.should_replace_all = false,
             'i' => replacement.is_case_sensitive = false,
-            _ => return Err(format!("unsupported flag {:?}", c)),
+            _ => {}
         }
     }
 
-    Ok(replacement)
+    replacement
 }
 
 #[cfg(test)]
diff --git a/crates/vim/test_data/test_command_replace.json b/crates/vim/test_data/test_command_replace.json
index 13928d5c7e138af7628e613f612a199a760d0798..91827c0285b3b74d3d7366047d408cba36879228 100644
--- a/crates/vim/test_data/test_command_replace.json
+++ b/crates/vim/test_data/test_command_replace.json
@@ -20,3 +20,10 @@
 {"Key":"0"}
 {"Key":"enter"}
 {"Get":{"state":"aa\ndd\nˇcc","mode":"Normal"}}
+{"Key":":"}
+{"Key":"%"}
+{"Key":"s"}
+{"Key":"/"}
+{"Key":"/"}
+{"Key":"/"}
+{"Key":"enter"}