refactor: minor refactors here and there

Author: AMythicDev

src/core/ev_handler.rs

@@ -82,6 +82,10 @@ pub fn handle_event(
             p.line_numbers = l;
             command_queue.push_back(Command::FormatRedrawDisplay);
         }
+        Command::UserInput(InputEvent::Number(n)) => {
+            p.prefix_num.push(n);
+            command_queue.push_back(Command::FormatRedrawPrompt);
+        }
         #[cfg(feature = "search")]
         Command::UserInput(InputEvent::Search(m)) => {
             p.search_mode = m;
@@ -95,7 +99,7 @@ pub fn handle_event(
             let mut active = lock.lock();
             *active = false;
             drop(active);
-            // let string = search::fetch_input(&mut out, p.search_mode, p.rows)?;
+            cvar.notify_one();
             let search_result = search::fetch_input(&mut out, p)?;
             let mut active = lock.lock();
             *active = true;

src/core/init.rs

@@ -330,10 +330,7 @@ fn event_reader(
         #[cfg(feature = "search")]
         {
             let (lock, cvar) = (&user_input_active.0, &user_input_active.1);
-            let mut active = lock.lock();
-            if !*active {
-                cvar.wait(&mut active);
-            }
+            let _guard = cvar.wait_while(&mut lock.lock(), |pending| !*pending);
         }
 
         if event::poll(std::time::Duration::from_millis(100))
@@ -344,17 +341,14 @@ fn event_reader(
             // Get the events
             let input = guard.input_classifier.classify_input(ev, &guard);
             if let Some(iev) = input {
-                if let InputEvent::Number(n) = iev {
-                    guard.prefix_num.push(n);
-                    guard.format_prompt();
-                } else if !guard.prefix_num.is_empty() {
+                if !matches!(iev, InputEvent::Number(_)) {
                     guard.prefix_num.clear();
                     guard.format_prompt();
                 }
                 if let Err(TrySendError::Disconnected(_)) = evtx.try_send(Command::UserInput(iev)) {
                     break;
                 }
-            } else if !guard.prefix_num.is_empty() {
+            } else {
                 guard.prefix_num.clear();
                 guard.format_prompt();
             }

src/search.rs

@@ -406,7 +406,6 @@ where
         )?;
         Ok(())
     };
-
     match so.ev.as_ref().unwrap() {
         Event::Key(KeyEvent { kind, .. }) if *kind != KeyEventKind::Press => (),
         // If Esc is pressed, cancel the search and also make sure that the search query is
@@ -533,20 +532,20 @@ where
             so.cursor_position = so.string.len().saturating_add(1).try_into().unwrap();
             term::move_cursor(out, so.cursor_position, so.rows, true)?;
         }
-
-        Event::Key(event) => {
+        Event::Key(KeyEvent {
+            code: KeyCode::Char(c),
+            modifiers: KeyModifiers::NONE,
+            ..
+        }) => {
             // For any character key, without a modifier, insert it into so.string before
             // current cursor position and update the line
-            if let KeyCode::Char(c) = event.code {
-                so.string
-                    .insert(so.cursor_position.saturating_sub(1).into(), c);
-
-                populate_word_index(so);
-                refresh_display(out, so)?;
-                so.cursor_position = so.cursor_position.saturating_add(1);
-                term::move_cursor(out, so.cursor_position, so.rows, false)?;
-                out.flush()?;
-            }
+            so.string
+                .insert(so.cursor_position.saturating_sub(1).into(), *c);
+            populate_word_index(so);
+            refresh_display(out, so)?;
+            so.cursor_position = so.cursor_position.saturating_add(1);
+            term::move_cursor(out, so.cursor_position, so.rows, false)?;
+            out.flush()?;
         }
         _ => return Ok(()),
     }