refactor: remove uses of Option in new_with_config()

src/application.rs

@@ -221,7 +221,6 @@ mod tests {
 		test_helpers::{
 			DefaultTestModule,
 			TestModuleProvider,
-			create_config,
 			create_event_reader,
 			mocks,
 			with_git_directory,
@@ -289,7 +288,7 @@ mod tests {
 
 	#[test]
 	fn todo_file_options_without_command() {
-		let mut config = create_config();
+		let mut config = Config::default();
 		config.undo_limit = 10;
 		config.git.comment_char = String::from("#");
 		config.post_modified_line_exec_command = None;
@@ -303,7 +302,7 @@ mod tests {
 
 	#[test]
 	fn todo_file_options_with_command() {
-		let mut config = create_config();
+		let mut config = Config::default();
 		config.undo_limit = 10;
 		config.git.comment_char = String::from("#");
 		config.post_modified_line_exec_command = Some(String::from("command"));

src/components/confirm/tests.rs

@@ -4,7 +4,7 @@ use super::*;
 use crate::{
 	assert_rendered_output,
 	input::StandardEvent,
-	test_helpers::{assertions::assert_rendered_output::AssertRenderOptions, create_test_keybindings},
+	test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
 };
 
 #[test]
@@ -23,47 +23,47 @@ fn render() {
 #[test]
 fn read_event_yes_uppercase() {
 	assert_eq!(
-		Confirm::read_event(Event::from('Y'), &create_test_keybindings()),
+		Confirm::read_event(Event::from('Y'), &KeyBindings::default()),
 		Event::from(StandardEvent::Yes)
 	);
 }
 
 #[test]
 fn read_event_yes_lowercase() {
 	assert_eq!(
-		Confirm::read_event(Event::from('y'), &create_test_keybindings()),
+		Confirm::read_event(Event::from('y'), &KeyBindings::default()),
 		Event::from(StandardEvent::Yes)
 	);
 }
 
 #[test]
 fn read_event_no_lowercase() {
 	assert_eq!(
-		Confirm::read_event(Event::from('n'), &create_test_keybindings()),
+		Confirm::read_event(Event::from('n'), &KeyBindings::default()),
 		Event::from(StandardEvent::No)
 	);
 }
 
 #[test]
 fn read_event_no_uppercase() {
 	assert_eq!(
-		Confirm::read_event(Event::from('N'), &create_test_keybindings()),
+		Confirm::read_event(Event::from('N'), &KeyBindings::default()),
 		Event::from(StandardEvent::No)
 	);
 }
 
 #[test]
 fn read_event_not_key_event() {
 	assert_eq!(
-		Confirm::read_event(Event::None, &create_test_keybindings()),
+		Confirm::read_event(Event::None, &KeyBindings::default()),
 		Event::None
 	);
 }
 
 #[test]
 fn read_event_not_char_event() {
 	assert_eq!(
-		Confirm::read_event(Event::from(KeyCode::Backspace), &create_test_keybindings()),
+		Confirm::read_event(Event::from(KeyCode::Backspace), &KeyBindings::default()),
 		Event::from(KeyCode::Backspace)
 	);
 }

src/config.rs

@@ -66,7 +66,7 @@ pub(crate) struct Config {
 }
 
 impl Config {
-	pub(crate) fn new_with_config(git_config: Option<&crate::git::Config>) -> Result<Self, ConfigError> {
+	pub(crate) fn new_with_config(git_config: &crate::git::Config) -> Result<Self, ConfigError> {
 		Ok(Self {
 			auto_select_next: get_bool(git_config, "interactive-rebase-tool.autoSelectNext", false)?,
 			diff_ignore_whitespace: get_diff_ignore_whitespace(
@@ -94,6 +94,25 @@ impl Config {
 	}
 }
 
+impl Default for Config {
+	fn default() -> Self {
+		Self {
+			auto_select_next: false,
+			diff_ignore_whitespace: DiffIgnoreWhitespaceSetting::None,
+			diff_ignore_blank_lines: false,
+			diff_show_whitespace: DiffShowWhitespaceSetting::Both,
+			diff_space_symbol: DEFAULT_SPACE_SYMBOL.to_owned(),
+			diff_tab_symbol: DEFAULT_TAB_SYMBOL.to_owned(),
+			diff_tab_width: 4,
+			undo_limit: 5000,
+			post_modified_line_exec_command: None,
+			git: GitConfig::default(),
+			key_bindings: KeyBindings::default(),
+			theme: Theme::default(),
+		}
+	}
+}
+
 impl TryFrom<&ConfigLoader> for Config {
 	type Error = ConfigError;
 
@@ -106,15 +125,15 @@ impl TryFrom<&ConfigLoader> for Config {
 		let config = config_loader
 			.load_config()
 			.map_err(|e| ConfigError::new_read_error("", ConfigErrorCause::GitError(e)))?;
-		Self::new_with_config(Some(&config))
+		Self::new_with_config(&config)
 	}
 }
 
 impl TryFrom<&crate::git::Config> for Config {
 	type Error = ConfigError;
 
 	fn try_from(config: &crate::git::Config) -> Result<Self, Self::Error> {
-		Self::new_with_config(Some(config))
+		Self::new_with_config(config)
 	}
 }
 
@@ -331,7 +350,7 @@ mod tests {
 			vec!["[interactive-rebase-tool]", value.as_str()]
 		};
 		with_git_config(&lines, |config| {
-			let config = Config::new_with_config(Some(&config)).unwrap();
+			let config = Config::new_with_config(&config).unwrap();
 			assert_eq!(access(config), expected);
 		});
 	}
@@ -353,7 +372,7 @@ mod tests {
 			],
 			|git_config| {
 				assert_err_eq!(
-					Config::new_with_config(Some(&git_config)),
+					Config::new_with_config(&git_config),
 					ConfigError::new(
 						format!("interactive-rebase-tool.{config_name}").as_str(),
 						config_value,
@@ -378,7 +397,7 @@ mod tests {
 			],
 			|git_config| {
 				assert_err_eq!(
-					Config::new_with_config(Some(&git_config)),
+					Config::new_with_config(&git_config),
 					ConfigError::new_read_error(
 						format!("interactive-rebase-tool.{config_name}").as_str(),
 						ConfigErrorCause::InvalidUtf

src/config/diff_ignore_whitespace_setting.rs

@@ -13,3 +13,14 @@ pub(crate) enum DiffIgnoreWhitespaceSetting {
 	/// ) flag.
 	Change,
 }
+
+impl DiffIgnoreWhitespaceSetting {
+	pub(crate) fn parse(s: &str) -> Option<Self> {
+		match s.to_lowercase().as_str() {
+			"true" | "on" | "all" => Some(DiffIgnoreWhitespaceSetting::All),
+			"change" => Some(DiffIgnoreWhitespaceSetting::Change),
+			"false" | "off" | "none" => Some(DiffIgnoreWhitespaceSetting::None),
+			_ => None,
+		}
+	}
+}

src/config/diff_show_whitespace_setting.rs

@@ -11,3 +11,15 @@ pub(crate) enum DiffShowWhitespaceSetting {
 	/// Show both leading and trailing whitespace characters.
 	Both,
 }
+
+impl DiffShowWhitespaceSetting {
+	pub(crate) fn parse(s: &str) -> Option<Self> {
+		match s.to_lowercase().as_str() {
+		"true" | "on" | "both" => Some(DiffShowWhitespaceSetting::Both),
+		"trailing" => Some(DiffShowWhitespaceSetting::Trailing),
+		"leading" => Some(DiffShowWhitespaceSetting::Leading),
+		"false" | "off" | "none" => Some(DiffShowWhitespaceSetting::None),
+		_ => None,
+		}
+	}
+}