Better git ansi color handling

Author: scottchiefbaker

diff-so-fancy

@@ -899,14 +899,14 @@ sub color {
 	}
 }
 
+# https://www.git-scm.com/book/en/v2/Customizing-Git-Git-Configuration#_colors_in_git
 sub git_ansi_color {
 	my $str   = shift();
 	my @parts = split(' ', $str);
 
 	if (!@parts) {
 		return '';
 	}
-
 	my $colors = {
 		'black'   => 0,
 		'red'     => 1,
@@ -918,46 +918,47 @@ sub git_ansi_color {
 		'white'   => 7,
 	};
 
-	my $fg  = $parts[0] || "";
-	my $mod = $parts[1] || "";
-	my $bg  = $parts[2] || "";
-
 	my @ansi_part = ();
-	#############################################
 
-	if ($mod eq 'bold') {
+	if (grep { /bold/ } @parts) {
 		push(@ansi_part, "1");
+		@parts = grep { !/bold/ } @parts; # Remove from array
 	}
 
+	if (grep { /reverse/ } @parts) {
+		push(@ansi_part, "7");
+		@parts = grep { !/reverse/ } @parts; # Remove from array
+	}
+
+	my $fg  = $parts[0] || "";
+	my $bg  = $parts[1] || "";
+
 	#############################################
 
-	# It's an RGB value
+	# It's an numeric value, so it's an 8 bit color
 	if (is_numeric($fg)) {
 		push(@ansi_part, "38;5;$fg");
 	# It's a simple 16 color OG ansi
 	} elsif ($fg) {
 		my $bright    = $fg =~ s/bright//;
 		my $color_num = $colors->{$fg} + 30;
 
-		if ($bright) { $color_num += 8; }
+		if ($bright) { $color_num += 60; } # Set bold
 
 		push(@ansi_part, $color_num);
 	}
 
 	#############################################
 
-	# It's an RGB value
+	# It's an numeric value, so it's an 8 bit color
 	if (is_numeric($bg)) {
 		push(@ansi_part, "48;5;$bg");
-	# Inverse/Reverse
-	} elsif ($bg =~ /reverse/i) {
-		push(@ansi_part, 7);
 	# It's a simple 16 color OG ansi
 	} elsif ($bg) {
 		my $bright    = $bg =~ s/bright//;
-		my $color_num = $colors->{$bg} + 30;
+		my $color_num = $colors->{$bg} + 40;
 
-		if ($bright) { $color_num += 8; }
+		if ($bright) { $color_num += 60; } # Set bold
 
 		push(@ansi_part, $color_num);
 	}