Fix search mode reset behaviour

Resetting this mode should clear its input and results. That said, we don't
want to reset automatically when entering this mode, because that breaks jumping
to the next result from normal mode.

src/commands/application.rs

@@ -189,9 +189,6 @@ pub fn switch_to_select_line_mode(app: &mut Application) -> Result {
 pub fn switch_to_search_mode(app: &mut Application) -> Result {
     if app.workspace.current_buffer.is_some() {
         app.switch_to(ModeKey::Search);
-        if let Mode::Search(ref mut mode) = app.mode {
-            mode.reset();
-        }
     } else {
         bail!(BUFFER_MISSING);
     }

src/commands/search.rs

@@ -67,11 +67,11 @@ pub fn accept_query(app: &mut Application) -> Result {
     Ok(())
 }
 
-pub fn clear_query(app: &mut Application) -> Result {
+pub fn reset(app: &mut Application) -> Result {
     if let Mode::Search(ref mut mode) = app.mode {
-        mode.input = None;
+        mode.reset();
     } else {
-        bail!("Can't clear search outside of search mode");
+        bail!("Can't reset search outside of search mode");
     };
 
     Ok(())

src/input/key_map/default.yml

@@ -58,7 +58,7 @@ normal:
   "#": application::switch_to_syntax_mode
   /:
     - application::switch_to_search_mode
-    - search::clear_query
+    - search::reset
   ",": view::scroll_up
   ">": buffer::indent_line
   "<": buffer::outdent_line
@@ -125,7 +125,7 @@ search:
     - search::run
   /:
     - application::switch_to_search_mode
-    - search::clear_query
+    - search::reset
   m: view::scroll_down
   ",": view::scroll_up
   n: search::move_to_next_result

src/models/application/modes/search.rs

@@ -20,6 +20,8 @@ impl SearchMode {
 
     pub fn reset(&mut self) {
         self.insert = true;
+        self.input = None;
+        self.results = None;
     }
 
     pub fn insert_mode(&self) -> bool {