Skip to content

Default colors update and note/warning/error messages detection #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nr1q wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Default colors update and note/warning/error messages detection #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654c047
Default colors update and note/warning/error messages detection
Feb 27, 2016
af4a131
Preserve original format
Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions colormake.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@
$col_default = $col_ltgray;
$col_gcc = $col_magenta . $col_brighten;
$col_make = $col_cyan;
$col_filename = $col_yellow;
$col_linenum = $col_cyan;
$col_filename = $col_cyan;
$col_linenum = $col_blue;
$col_trace = $col_yellow;
$col_warning = $col_green;
$col_note = $col_green . $col_brighten;
$col_warning = $col_yellow . $col_brighten;
$col_comment = $col_drkgray;
$tag_error = "";
$col_error = $tag_error . $col_yellow . $col_brighten;
$col_error = $tag_error . $col_red . $col_brighten;
$error_highlight = $col_brighten;

# read in config files: system first, then user
Expand Down Expand Up @@ -88,7 +89,7 @@
# I suppose this is bad, but it's better than what less does!
if ($cols >= 0)
{
$thisline =~ s/^(.{$cols}).....*(.{15})$/$1 .. $2/;
$thisline =~ s/^(.{$cols}).....*(.{15})$/$1 .. $2/;
}

# make[1]: Entering directory `/blah/blah/blah'
Expand Down Expand Up @@ -119,24 +120,32 @@
{
# Do interesting things if make is compiling something.

if (($thisline !~ /[,:]$/) && ($thisline !~ /warning/))
if (($thisline !~ /[,:]$/) && ($thisline =~ /^\ /) && ($thisline !~ /note|warning|error/))
{
# This normally matches the source code snippet.
$thisline = $col_norm . $thisline;
}
elsif ($thisline =~ /note:/)
{
$thisline =~ s|(note:\s+)(.*)$|$col_note$1$2$col_norm|;
}
elsif ($thisline =~ /warning:/)
{
$thisline =~ s|(warning:\s+)(.*)$|$col_warning$1$2$col_norm|;
}
elsif ($thisline =~ /error:/)
{
# error?
if ($cols >= 0)
{
# Retruncate line, because we are about to insert "Error:".
my $c = $cols - length($tag_error);
$thisline = $orgline;
$thisline =~ s/^(.{$c}).....*(.{15})$/$1 .. $2/;
$thisline =~ s/^(.{$c}).....*(.{15})$/$1 .. $2/;
}
$thisline =~ s/(\d+:\s+)/$1$col_default$col_error/;
$thisline =~ s/(\d+:\s+)/$1$col_default/;
$thisline =~ s/(error:)/$col_error$col_blink$1$col_norm$col_error/;
$thisline = $error_highlight . $thisline . $col_norm;
}
else
{
# warning
$thisline =~ s|(warning:\s+)(.*)$|$1$col_warning$2|;
}

# In file included from main.cpp:38:
# main.cpp: In function int main(...)':
Expand Down