Implement Searchable for list module search

Author: MitMaro

src/components/search_bar.rs

@@ -54,10 +54,23 @@ impl SearchBar {
 		}
 	}
 
-	pub(crate) const fn read_event(&self, event: Event) -> Option<Event> {
+	pub(crate) fn read_event(&self, event: Event) -> Option<Event> {
 		match self.state {
 			State::Deactivated | State::Searching => None,
-			State::Editing => Some(event),
+			State::Editing => {
+				let evt = match event {
+					Event::Key(KeyEvent {
+						code: KeyCode::Enter,
+						modifiers: KeyModifiers::NONE,
+					}) => Event::from(StandardEvent::SearchFinish),
+					Event::Key(KeyEvent {
+						code: KeyCode::Esc,
+						modifiers: KeyModifiers::NONE,
+					}) => Event::from(StandardEvent::SearchCancel),
+					_ => event,
+				};
+				Some(evt)
+			},
 		}
 	}
 
@@ -72,11 +85,7 @@ impl SearchBar {
 			Event::Standard(StandardEvent::SearchPrevious) => {
 				SearchBarAction::Previous(String::from(self.editable_line.get_content()))
 			},
-			Event::Standard(StandardEvent::SearchFinish)
-			| Event::Key(KeyEvent {
-				code: KeyCode::Enter,
-				modifiers: KeyModifiers::NONE,
-			}) => {
+			Event::Standard(StandardEvent::SearchFinish) => {
 				self.editable_line.set_read_only(true);
 				self.state = State::Searching;
 				SearchBarAction::Start(String::from(self.editable_line.get_content()))
@@ -85,10 +94,7 @@ impl SearchBar {
 				self.state = State::Deactivated;
 				SearchBarAction::Cancel
 			},
-			Event::Key(KeyEvent {
-				code: KeyCode::Esc,
-				modifiers: KeyModifiers::NONE,
-			}) => {
+			Event::Standard(StandardEvent::SearchCancel) => {
 				self.reset();
 				SearchBarAction::Cancel
 			},
@@ -121,10 +127,6 @@ impl SearchBar {
 		self.state == State::Editing
 	}
 
-	pub(crate) fn is_searching(&self) -> bool {
-		self.state == State::Searching
-	}
-
 	pub(crate) fn build_view_line(&self) -> ViewLine {
 		ViewLine::from(self.editable_line.line_segments())
 	}

src/components/search_bar/options.rs

@@ -87,12 +87,32 @@ fn read_event_searching() {
 }
 
 #[test]
-fn read_event_editing() {
+fn read_event_editing_other() {
 	let mut search_bar = SearchBar::new();
 	search_bar.state = State::Editing;
 	assert_some_eq!(search_bar.read_event(Event::from('a')), Event::from('a'));
 }
 
+#[test]
+fn read_event_editing_with_enter() {
+	let mut search_bar = SearchBar::new();
+	search_bar.state = State::Editing;
+	assert_some_eq!(
+		search_bar.read_event(Event::from(KeyCode::Enter)),
+		Event::from(StandardEvent::SearchFinish)
+	);
+}
+
+#[test]
+fn read_event_editing_ith_esc() {
+	let mut search_bar = SearchBar::new();
+	search_bar.state = State::Editing;
+	assert_some_eq!(
+		search_bar.read_event(Event::from(KeyCode::Esc)),
+		Event::from(StandardEvent::SearchCancel)
+	);
+}
+
 #[test]
 fn handle_event_inactive() {
 	let mut search_bar = SearchBar::new();
@@ -137,21 +157,10 @@ fn handle_event_search_finish() {
 }
 
 #[test]
-fn handle_event_search_finish_with_enter() {
-	let mut search_bar = SearchBar::new();
-	search_bar.start_search(Some("foo"));
-	let event = Event::from(KeyCode::Enter);
-	assert_eq!(
-		search_bar.handle_event(event),
-		SearchBarAction::Start(String::from("foo"))
-	);
-}
-
-#[test]
-fn handle_event_search_cancel_with_esc() {
+fn handle_event_search_cancel_with_search_cancel() {
 	let mut search_bar = SearchBar::new();
 	search_bar.start_search(Some("foo"));
-	let event = Event::from(KeyCode::Esc);
+	let event = Event::from(StandardEvent::SearchCancel);
 	assert_eq!(search_bar.handle_event(event), SearchBarAction::Cancel);
 }
 
@@ -244,17 +253,6 @@ fn is_editing() {
 	assert!(!search_bar.is_editing());
 }
 
-#[test]
-fn is_searching() {
-	let mut search_bar = SearchBar::new();
-	search_bar.state = State::Editing;
-	assert!(!search_bar.is_searching());
-	search_bar.state = State::Deactivated;
-	assert!(!search_bar.is_searching());
-	search_bar.state = State::Searching;
-	assert!(search_bar.is_searching());
-}
-
 #[test]
 fn build_view_line() {
 	assert_rendered_output!(

src/components/search_bar/tests.rs

@@ -120,6 +120,14 @@ impl EventHandler {
 			e if key_bindings.search_next.contains(&e) => Some(Event::from(StandardEvent::SearchNext)),
 			e if key_bindings.search_previous.contains(&e) => Some(Event::from(StandardEvent::SearchPrevious)),
 			e if key_bindings.search_start.contains(&e) => Some(Event::from(StandardEvent::SearchStart)),
+			Event::Key(KeyEvent {
+				code: KeyCode::Esc,
+				modifiers: KeyModifiers::NONE,
+			}) => Some(Event::from(StandardEvent::SearchCancel)),
+			Event::Key(KeyEvent {
+				code: KeyCode::Enter,
+				modifiers: KeyModifiers::NONE,
+			}) => Some(Event::from(StandardEvent::SearchFinish)),
 			_ => None,
 		}
 	}
@@ -256,6 +264,8 @@ mod tests {
 	#[case::search_next(Event::from('n'), Event::from(StandardEvent::SearchNext))]
 	#[case::search_previous(Event::from('N'), Event::from(StandardEvent::SearchPrevious))]
 	#[case::search_start(Event::from('/'), Event::from(StandardEvent::SearchStart))]
+	#[case::esc(Event::from(KeyCode::Esc), Event::from(StandardEvent::SearchCancel))]
+	#[case::enter(Event::from(KeyCode::Enter), Event::from(StandardEvent::SearchFinish))]
 	#[case::other(Event::from('a'), Event::from(KeyCode::Null))]
 	fn search_inputs(#[case] event: Event, #[case] expected: Event) {
 		let event_handler = EventHandler::new(create_test_keybindings());

src/input/event_handler.rs

@@ -34,6 +34,8 @@ pub(crate) enum StandardEvent {
 	SearchNext,
 	/// Previous search result meta event.
 	SearchPrevious,
+	/// Cancel search mode meta event.
+	SearchCancel,
 	/// Finish search mode meta event.
 	SearchFinish,
 	/// The abort meta event.

src/input/standard_event.rs

@@ -2,14 +2,13 @@
 #![cfg_attr(allow_unknown_lints, allow(unknown_lints))]
 #![cfg_attr(allow_unknown_lints, allow(renamed_and_removed_lints))]
 // enable all rustc's built-in lints
-#![deny(
+#![warn(
 	future_incompatible,
 	nonstandard_style,
 	rust_2018_compatibility,
 	rust_2018_idioms,
 	rust_2021_compatibility,
-	unused,
-	warnings
+	unused
 )]
 // rustc's additional allowed by default lints
 #![deny(
@@ -112,6 +111,7 @@
 		clippy::panic,
 		clippy::shadow_reuse,
 		clippy::shadow_unrelated,
+		clippy::struct_field_names,
 		clippy::undocumented_unsafe_blocks,
 		clippy::unimplemented,
 		clippy::unreachable