kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Log exception with bold and underline for TTYs

Browse source 
Print error message in bold/underlined text if STDERR is unchanged and a tty.
[Feature #14160] [experimental]

Screenshot: https://img.sorah.jp/s/2017-11-29_1711_xj2fu.png

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
sorah 2017-11-29 11:14:23 +00:00
parent b8d15b7e47
commit b5e0ca4730
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -284,6 +284,9 @@ with all sufficient information, see the ChangeLog file or Redmine
* Print backtrace and error message in reverse order if STDERR is unchanged and a tty. * Print backtrace and error message in reverse order if STDERR is unchanged and a tty.
[Feature #8661] [experimental] [Feature #8661] [experimental]
* Print error message in bold/underlined text if STDERR is unchanged and a tty.
[Feature #14160] [experimental]
* configure option --with-ext now mandates its arguments. So for * configure option --with-ext now mandates its arguments. So for
instance if you run ./configure --with-ext=openssl,+ then the instance if you run ./configure --with-ext=openssl,+ then the
openssl library is guaranteed compiled, otherwise the build fails openssl library is guaranteed compiled, otherwise the build fails

23
eval_error.c
View file

@ -73,8 +73,11 @@ error_print(rb_execution_context_t *ec)
} }
static void static void
print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg) print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg, int colored)
{ {
static const char underline[] = "\033[4;1m";
static const char bold[] = "\033[1m";
static const char reset[] = "\033[m";
const char *einfo = ""; const char *einfo = "";
long elen = 0; long elen = 0;
VALUE mesg; VALUE mesg;
@ -89,13 +92,16 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg)
warn_print(": "); warn_print(": ");
} }
if (colored) warn_print(bold);
if (!NIL_P(emesg)) { if (!NIL_P(emesg)) {
einfo = RSTRING_PTR(emesg); einfo = RSTRING_PTR(emesg);
elen = RSTRING_LEN(emesg); elen = RSTRING_LEN(emesg);
} }
} }
if (eclass == rb_eRuntimeError && elen == 0) { if (eclass == rb_eRuntimeError && elen == 0) {
if (colored) warn_print(underline);
warn_print("unhandled exception\n"); warn_print("unhandled exception\n");
} }
else { else {
@ -103,6 +109,7 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg)
epath = rb_class_name(eclass); epath = rb_class_name(eclass);
if (elen == 0) { if (elen == 0) {
if (colored) warn_print(underline);
warn_print_str(epath); warn_print_str(epath);
warn_print("\n"); warn_print("\n");
} }
@ -119,7 +126,10 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg)
warn_print_str(tail ? rb_str_subseq(emesg, 0, len) : emesg); warn_print_str(tail ? rb_str_subseq(emesg, 0, len) : emesg);
if (epath) { if (epath) {
warn_print(" ("); warn_print(" (");
warn_print_str(epath); if (colored) warn_print(underline);
warn_print_str(epath);
if (colored) warn_print(reset);
if (colored) warn_print(bold);
warn_print(")\n"); warn_print(")\n");
} }
if (tail) { if (tail) {
@ -128,6 +138,7 @@ print_errinfo(const VALUE eclass, const VALUE errat, const VALUE emesg)
if (tail ? einfo[elen-1] != '\n' : !epath) warn_print2("\n", 1); if (tail ? einfo[elen-1] != '\n' : !epath) warn_print2("\n", 1);
} }
} }
if (colored) warn_print(reset);
} }
static void static void
@ -192,12 +203,12 @@ rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
} }
} }
if (rb_stderr_tty_p()) { if (rb_stderr_tty_p()) {
warn_print("Traceback (most recent call last):\n"); warn_print("\033[1mTraceback \033[m(most recent call last):\n");
print_backtrace(eclass, errat, TRUE); print_backtrace(eclass, errat, TRUE);
print_errinfo(eclass, errat, emesg); print_errinfo(eclass, errat, emesg, TRUE);
} }
else { else {
print_errinfo(eclass, errat, emesg); print_errinfo(eclass, errat, emesg, FALSE);
print_backtrace(eclass, errat, FALSE); print_backtrace(eclass, errat, FALSE);
} }
error: error: