refactor: move checkout_option_to_string into CheckoutOptions::to_string_pair

Author: Fatpandac

src/popups/checkout_option.rs

@@ -3,7 +3,7 @@ use crate::components::{
 	DrawableComponent, EventState,
 };
 use crate::queue::{InternalEvent, NeedsUpdate};
-use crate::strings::{checkout_option_to_string, CheckoutOptions};
+use crate::strings::CheckoutOptions;
 use crate::try_or_popup;
 use crate::{
 	app::Environment,
@@ -43,7 +43,7 @@ impl CheckoutOptionPopup {
 			queue: env.queue.clone(),
 			repo: env.repo.borrow().clone(),
 			branch: None,
-			option: CheckoutOptions::StashAndReapply,
+			option: CheckoutOptions::KeepLocalChanges,
 			visible: false,
 			key_config: env.key_config.clone(),
 			theme: env.theme.clone(),
@@ -64,8 +64,7 @@ impl CheckoutOptionPopup {
 			),
 		]));
 
-		let (kind_name, kind_desc) =
-			checkout_option_to_string(self.option);
+		let (kind_name, kind_desc) = self.option.to_string_pair();
 
 		txt.push(Line::from(vec![
 			Span::styled(
@@ -108,7 +107,7 @@ impl CheckoutOptionPopup {
 
 	fn handle_event(&mut self) -> Result<()> {
 		match self.option {
-			CheckoutOptions::StashAndReapply => {
+			CheckoutOptions::KeepLocalChanges => {
 				let stash_id =
 					stash_save(&self.repo, None, true, false)?;
 				self.checkout()?;
@@ -133,21 +132,21 @@ impl CheckoutOptionPopup {
 	fn change_kind(&mut self, incr: bool) {
 		self.option = if incr {
 			match self.option {
-				CheckoutOptions::StashAndReapply => {
+				CheckoutOptions::KeepLocalChanges => {
 					CheckoutOptions::Unchange
 				}
 				CheckoutOptions::Unchange => CheckoutOptions::Discard,
 				CheckoutOptions::Discard => {
-					CheckoutOptions::StashAndReapply
+					CheckoutOptions::KeepLocalChanges
 				}
 			}
 		} else {
 			match self.option {
-				CheckoutOptions::StashAndReapply => {
+				CheckoutOptions::KeepLocalChanges => {
 					CheckoutOptions::Discard
 				}
 				CheckoutOptions::Unchange => {
-					CheckoutOptions::StashAndReapply
+					CheckoutOptions::KeepLocalChanges
 				}
 				CheckoutOptions::Discard => CheckoutOptions::Unchange,
 			}

src/strings.rs

@@ -440,29 +440,31 @@ pub fn ellipsis_trim_start(s: &str, width: usize) -> Cow<'_, str> {
 
 #[derive(PartialEq, Eq, Clone, Copy)]
 pub enum CheckoutOptions {
-	StashAndReapply,
+	KeepLocalChanges,
 	Unchange,
 	Discard,
 }
 
-pub const fn checkout_option_to_string(
-	kind: CheckoutOptions,
-) -> (&'static str, &'static str) {
-	const CHECKOUT_OPTION_STASH_AND_REAPPLY: &str =
-		" 🟢 Stash and reapply changes";
-	const CHECKOUT_OPTION_UNCHANGE: &str = " 🟡 Keep local changes";
-	const CHECKOUT_OPTION_DISCARD: &str =
-		" 🔴 Discard all local changes";
+impl CheckoutOptions {
+	pub fn to_string_pair(&self) -> (&'static str, &'static str) {
+		const CHECKOUT_OPTION_STASH_AND_REAPPLY: &str =
+			" 🟢 Stash and reapply changes";
+		const CHECKOUT_OPTION_UNCHANGE: &str =
+			" 🟡 Keep local changes";
+		const CHECKOUT_OPTION_DISCARD: &str =
+			" 🔴 Discard all local changes";
 
-	match kind {
-		CheckoutOptions::StashAndReapply => {
-			("Stash and reapply", CHECKOUT_OPTION_STASH_AND_REAPPLY)
-		}
-		CheckoutOptions::Unchange => {
-			("Don't change", CHECKOUT_OPTION_UNCHANGE)
-		}
-		CheckoutOptions::Discard => {
-			("Discard", CHECKOUT_OPTION_DISCARD)
+		match self {
+			CheckoutOptions::KeepLocalChanges => (
+				"Stash and reapply",
+				CHECKOUT_OPTION_STASH_AND_REAPPLY,
+			),
+			CheckoutOptions::Unchange => {
+				("Don't change", CHECKOUT_OPTION_UNCHANGE)
+			}
+			CheckoutOptions::Discard => {
+				("Discard", CHECKOUT_OPTION_DISCARD)
+			}
 		}
 	}
 }