Skip to content

Commit 4ef5a78

Browse files
Use the cached git config to set the DiffHiglight colors
This should speedup start up a decent amount
1 parent 5ed6159 commit 4ef5a78

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

diff-so-fancy

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ my $reset_color = color("reset");
3232
my $bold = color("bold");
3333
my $meta_color = "";
3434

35+
# Set the diff highlight colors from the config
36+
init_diff_highlight_colors();
37+
3538
my ($file_1,$file_2);
3639
my $args = argv(); # Hashref of all the ARGV stuff
3740
my $last_file_seen = "";
@@ -1039,4 +1042,12 @@ sub yes_no {
10391042
}
10401043
}
10411044

1045+
sub init_diff_highlight_colors {
1046+
$DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal')) || color("2_bold");
1047+
$DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) || color("2_bold") . color("on_22");
1048+
1049+
$DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal')) || color("1_bold");
1050+
$DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) || color("1_bold") . color("on_52");
1051+
}
1052+
10421053
# vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4

lib/DiffHighlight.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ my $NULL = File::Spec->devnull();
1212
# Highlight by reversing foreground and background. You could do
1313
# other things like bold or underline if you prefer.
1414
our @OLD_HIGHLIGHT = (
15-
color_config('color.diff-highlight.oldnormal', "\e[1;31m"),
16-
color_config('color.diff-highlight.oldhighlight', "\e[1;31;48;5;52m"),
15+
"\e[1;31m",
16+
"\e[1;31;48;5;52m",
1717
"\x1b[27m",
1818
);
1919
our @NEW_HIGHLIGHT = (
20-
color_config('color.diff-highlight.newnormal', "\e[1;32m"),
21-
color_config('color.diff-highlight.newhighlight', "\e[1;32;48;5;22m"),
20+
"\e[1;32m",
21+
"\e[1;32;48;5;22m",
2222
$OLD_HIGHLIGHT[2],
2323
);
2424

0 commit comments

Comments
 (0)