diff options
-rw-r--r-- | src/cli.rs | 1 | ||||
-rw-r--r-- | src/config.rs | 34 | ||||
-rw-r--r-- | src/options/set.rs | 30 |
3 files changed, 41 insertions, 24 deletions
@@ -637,7 +637,6 @@ pub struct ComputedValues { pub inspect_raw_lines: InspectRawLines, pub is_light_mode: bool, pub paging_mode: PagingMode, - pub syntax_dummy_theme: SyntaxTheme, pub syntax_set: SyntaxSet, pub syntax_theme: Option<SyntaxTheme>, pub true_color: bool, diff --git a/src/config.rs b/src/config.rs index 573a08ed..9dfea5d4 100644 --- a/src/config.rs +++ b/src/config.rs @@ -496,3 +496,37 @@ pub fn delta_unreachable(message: &str) -> ! { ); process::exit(error_exit_code); } + +#[cfg(test)] +pub mod tests { + use crate::bat_utils::output::PagingMode; + use crate::cli; + use crate::tests::integration_test_utils; + use std::fs::remove_file; + + #[test] + fn test_get_computed_values_from_config() { + let git_config_contents = b" +[delta] + true-color = never + width = 100 + inspect-raw-lines = true + paging = never + syntax-theme = None +"; + let git_config_path = "delta__test_get_true_color_from_config.gitconfig"; + let config = integration_test_utils::make_config_from_args_and_git_config( + &[], + Some(git_config_contents), + Some(git_config_path), + ); + assert_eq!(config.true_color, false); + assert_eq!(config.decorations_width, cli::Width::Fixed(100)); + assert_eq!(config.background_color_extends_to_terminal_width, true); + assert_eq!(config.inspect_raw_lines, cli::InspectRawLines::True); + assert_eq!(config.paging_mode, PagingMode::Never); + assert!(config.syntax_theme.is_none()); + // syntax_set doesn't depend on gitconfig. + remove_file(git_config_path).unwrap(); + } +} diff --git a/src/options/set.rs b/src/options/set.rs index 42a98387..cf17e2b2 100644 --- a/src/options/set.rs +++ b/src/options/set.rs @@ -90,12 +90,8 @@ pub fn set_options( let features = gather_features(opt, &builtin_features, git_config); opt.features = features.join(" "); - set_widths(opt, git_config, arg_matches, &option_names); - // Set light, dark, and syntax-theme. - set_true_color(opt); set__light__dark__syntax_theme__options(opt, git_config, arg_matches, &option_names); - theme::set__is_light_mode__syntax_theme__syntax_set(opt, assets); // HACK: make minus-line styles have syntax-highlighting iff side-by-side. if features.contains(&"side-by-side".to_string()) { @@ -192,6 +188,10 @@ pub fn set_options( true ); + // Setting ComputedValues + set_widths(opt); + set_true_color(opt); + theme::set__is_light_mode__syntax_theme__syntax_set(opt, assets); opt.computed.inspect_raw_lines = cli::InspectRawLines::from_str(&opt.inspect_raw_lines).unwrap(); opt.computed.paging_mode = parse_paging_mode(&opt.paging_mode); @@ -509,28 +509,10 @@ fn parse_paging_mode(paging_mode_string: &str) -> PagingMode { } } -fn set_widths( - opt: &mut cli::Opt, - git_config: &mut Option<GitConfig>, - arg_matches: &clap::ArgMatches, - option_names: &HashMap<&str, &str>, -) { +fn set_widths(opt: &mut cli::Opt) { // Allow one character in case e.g. `less --status-column` is in effect. See #41 and #10. opt.computed.available_terminal_width = (Term::stdout().size().1 - 1) as usize; - let empty_builtin_features = HashMap::new(); - if opt.width.is_none() { - set_options!( - [width], - opt, - &empty_builtin_features, - git_config, - arg_matches, - option_names, - false - ); - } - let (decorations_width, background_color_extends_to_terminal_width) = match opt.width.as_deref() { Some("variable") => (cli::Width::Variable, false), @@ -559,6 +541,7 @@ fn set_true_color(opt: &mut cli::Opt) { opt.true_color = _24_bit_color.clone(); } } + opt.computed.true_color = match opt.true_color.as_ref() { "always" => true, "never" => false, @@ -721,6 +704,7 @@ pub mod tests { assert_eq!(opt.side_by_side, true); assert_eq!(opt.syntax_theme, Some("xxxyyyzzz".to_string())); assert_eq!(opt.tab_width, 77); + assert_eq!(opt.true_color, "never"); assert_eq!(opt.whitespace_error_style, "black black"); assert_eq!(opt.width, Some("77".to_string())); assert_eq!(opt.tokenization_regex, "xxxyyyzzz"); |