From 22ad2bcad5e20e698b212ea526da41d7fc00efec Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Mon, 22 Nov 2021 15:08:25 -0500 Subject: Fix non-compiling code after independent merges --- src/parse_styles.rs | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) (limited to 'src/parse_styles.rs') diff --git a/src/parse_styles.rs b/src/parse_styles.rs index 86d869ea..39e436f7 100644 --- a/src/parse_styles.rs +++ b/src/parse_styles.rs @@ -353,7 +353,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-match-line-style", if let Some(s) = &opt.grep_match_line_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("zero-style".to_owned()) }, @@ -361,7 +367,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-match-word-style", if let Some(s) = &opt.grep_match_word_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("plus-emph-style".to_owned()) }, @@ -369,7 +381,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-context-line-style", if let Some(s) = &opt.grep_context_line_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("zero-style".to_owned()) }, @@ -377,7 +395,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-file-style", if let Some(s) = &opt.grep_file_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("hunk-header-file-style".to_owned()) }, @@ -385,7 +409,13 @@ fn make_grep_styles(opt: &cli::Opt, styles: &mut HashMap<&str, StyleReference>) ( "grep-line-number-style", if let Some(s) = &opt.grep_line_number_style { - style_from_str(s, None, None, opt.computed.true_color) + style_from_str( + s, + None, + None, + opt.computed.true_color, + opt.git_config.as_ref(), + ) } else { StyleReference::Reference("hunk-header-line-number-style".to_owned()) }, -- cgit v1.2.3