Skip to content

Commit 75587c6

Browse files
Further expand --debug
1 parent d96b105 commit 75587c6

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

diff-so-fancy

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,15 @@ sub in_unit_test {
507507

508508
sub get_less_charset {
509509
my @less_char_vars = ("LESSCHARSET", "LESSCHARDEF", "LC_ALL", "LC_CTYPE", "LANG");
510-
foreach (@less_char_vars) {
511-
return $ENV{$_} if defined $ENV{$_};
510+
foreach my $key (@less_char_vars) {
511+
my $val = $ENV{$key};
512+
513+
if (defined $val) {
514+
return ($key, $val);
515+
}
512516
}
513517

514-
return "";
518+
return ();
515519
}
516520

517521
sub should_print_unicode {
@@ -521,7 +525,7 @@ sub should_print_unicode {
521525
}
522526

523527
# Otherwise, assume we're piping to less(1)
524-
my $less_charset = get_less_charset();
528+
my ($less_env_var, $less_charset) = get_less_charset();
525529
if ($less_charset =~ /utf-?8/i) {
526530
return 1;
527531
}
@@ -933,19 +937,24 @@ sub get_terminal_width {
933937
}
934938

935939
sub show_debug_info {
940+
my @less = get_less_charset();
936941
my $git_ver = trim(`git --version`);
937-
$git_ver =~ s/[^\d.]//g;
942+
$git_ver =~ s/[^\d.]//g;
938943

939944
print "Diff-so-fancy : v$VERSION\n";
940945
print "Git : v$git_ver\n";
941946
print "Perl : $^V\n";
942947
print "\n";
943948

944-
print "Supports Unicode: " . yes_no(should_print_unicode()) . "\n";
945-
print "Unicode Ruler : " . yes_no($use_unicode_dash_for_ruler) . "\n";
946949
print "Terminal width : " . get_terminal_width() . "\n";
947950
print "Terminal \$LANG : " . $ENV{LANG} . "\n";
948-
print "Less Charset : " . get_less_charset() . "\n";
951+
print "\n";
952+
print "Supports Unicode: " . yes_no(should_print_unicode()) . "\n";
953+
print "Unicode Ruler : " . yes_no($use_unicode_dash_for_ruler) . "\n";
954+
print "\n";
955+
print "Less Charset Var: " . ($less[0] // "") . "\n";
956+
print "Less Charset : " . ($less[1] // "") . "\n";
957+
print "\n";
949958
print "Is Windows : " . yes_no(is_windows()) . "\n";
950959
print "Operating System: $^O\n";
951960
}

0 commit comments

Comments
 (0)