From b698e538e8b451c31dc70f69c4b5149b3595c532 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Mon, 12 Sep 2016 13:28:13 +0200 Subject: [PATCH 1/7] Change default warn color to yellow --- base/client.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/client.jl b/base/client.jl index 1c544394b8fb1..757ad444bddac 100644 --- a/base/client.jl +++ b/base/client.jl @@ -35,7 +35,7 @@ Available colors are: $available_text_colors_docstring. text_colors have_color = false -default_color_warn = :red +default_color_warn = :yellow default_color_info = :cyan if is_windows() default_color_input = :normal From 806db05f2d0bb10c41841f10dbd210064928b327 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Sat, 17 Sep 2016 12:24:09 +0200 Subject: [PATCH 2/7] add news entry --- NEWS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 31aebe866ce37..ee0df4593bd48 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,9 +14,9 @@ New language features Language changes ---------------- - * The default color for info messages has been changed from blue to cyan. - This can be changed back to the original color by setting the environment variable `JULIA_INFO_COLOR` to `"blue"`. - One way of doing this is by adding `ENV["JULIA_INFO_COLOR"] = :blue` to the `.juliarc.jl` file. + * The default color for info messages has been changed from blue to cyan and for warning messages from red to yellow. + This can be changed back to the original colors by setting the environment variables `JULIA_INFO_COLOR` to `"blue"` and `JULIA_WARN_COLOR` to `"red"`. + One way of doing this is by adding for example `ENV["JULIA_INFO_COLOR"] = :blue` and `ENV["JULIA_WARN_COLOR"] = :red` to the `.juliarc.jl` file. For more information regarding customizing colors in the REPL, see this [manual section]( http://docs.julialang.org/en/latest/manual/interacting-with-julia/#customizing-colors). Breaking changes From 6a8a6684373cf4d5f01686b67d9486f0fdeb8ec7 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Fri, 16 Dec 2016 09:28:20 +0100 Subject: [PATCH 3/7] das --- NEWS.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index c2a8e514fa703..9e8282fcd03c7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,11 +7,6 @@ New language features Language changes ---------------- - * The default color for info messages has been changed from blue to cyan and for warning messages from red to yellow. - This can be changed back to the original colors by setting the environment variables `JULIA_INFO_COLOR` to `"blue"` and `JULIA_WARN_COLOR` to `"red"`. - One way of doing this is by adding for example `ENV["JULIA_INFO_COLOR"] = :blue` and `ENV["JULIA_WARN_COLOR"] = :red` to the `.juliarc.jl` file. - For more information regarding customizing colors in the REPL, see this [manual section]( http://docs.julialang.org/en/latest/manual/interacting-with-julia/#customizing-colors). - * Multiline and singleline nonstandard command literals have been added. A nonstandard command literal is like a nonstandard string literal, but the syntax uses backquotes (``` ` ```) instead of double quotes, and the @@ -65,9 +60,9 @@ Library improvements Therefore, light versions of the colors are now supported. For the available colors see the help entry on `print_with_color`. - * The default color for info messages has been changed from blue to cyan ([#18442]). - This can be changed back to the original color by setting the environment variable `JULIA_INFO_COLOR` to `"blue"`. - One way of doing this is by adding `ENV["JULIA_INFO_COLOR"] = :blue` to the `.juliarc.jl` file. +* The default color for info messages has been changed from blue to cyan and for warning messages from red to yellow. + This can be changed back to the original colors by setting the environment variables `JULIA_INFO_COLOR` to `"blue"` and `JULIA_WARN_COLOR` to `"red"`. + One way of doing this is by adding for example `ENV["JULIA_INFO_COLOR"] = :blue` and `ENV["JULIA_WARN_COLOR"] = :red` to the `.juliarc.jl` file. For more information regarding customizing colors in the REPL, see this [manual section]( http://docs.julialang.org/en/latest/manual/interacting-with-julia/#customizing-colors). * Iteration utilities that wrap iterators and return other iterators (`enumerate`, `zip`, `rest`, From 88cb3528ed8952125326cafc5b44125d004a22da Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Fri, 16 Dec 2016 09:44:38 +0100 Subject: [PATCH 4/7] foo --- base/pkg/entry.jl | 2 +- base/test.jl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/pkg/entry.jl b/base/pkg/entry.jl index 9a1b0f1d001d3..6c6ab1050ccda 100644 --- a/base/pkg/entry.jl +++ b/base/pkg/entry.jl @@ -179,7 +179,7 @@ function status(io::IO, pkg::AbstractString, ver::VersionNumber, fix::Bool) finalize(prepo) end else - print_with_color(:yellow, io, "non-repo (unregistered)") + print_with_color(Base.warn_color(), io, "non-repo (unregistered)") end println(io) end diff --git a/base/test.jl b/base/test.jl index a0d3f98328678..bc5107ceb74e6 100644 --- a/base/test.jl +++ b/base/test.jl @@ -140,7 +140,7 @@ type Broken <: Result orig_expr end function Base.show(io::IO, t::Broken) - print_with_color(:yellow, io, "Test Broken\n"; bold = true) + print_with_color(:Base.warn_color(), io, "Test Broken\n"; bold = true) if t.test_type == :skipped && !(t.orig_expr === nothing) println(io, " Skipped: ", t.orig_expr) elseif !(t.orig_expr === nothing) @@ -489,7 +489,7 @@ function print_test_results(ts::DefaultTestSet, depth_pad=0) print_with_color(Base.error_color(), lpad("Error",error_width," "), " "; bold = true) end if broken_width > 0 - print_with_color(:yellow, lpad("Broken",broken_width," "), " "; bold = true) + print_with_color(Base.warn_color(), lpad("Broken",broken_width," "), " "; bold = true) end if total_width > 0 print_with_color(Base.info_color(), lpad("Total",total_width, " "); bold = true) @@ -619,7 +619,7 @@ function print_counts(ts::DefaultTestSet, depth, align, nb = broken + c_broken if nb > 0 - print_with_color(:yellow, lpad(string(nb), broken_width, " "), " ") + print_with_color(Base.warn_color(), lpad(string(nb), broken_width, " "), " ") elseif broken_width > 0 # None broken at this level, but some at another level print(lpad(" ", broken_width), " ") From 442fdff1bcfdc5a1c5374a495589bde513c2783d Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Fri, 16 Dec 2016 11:15:09 +0100 Subject: [PATCH 5/7] Update client.jl --- base/client.jl | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/client.jl b/base/client.jl index aa45e49a02d25..eff0589986a0c 100644 --- a/base/client.jl +++ b/base/client.jl @@ -56,10 +56,8 @@ will print text with all text properties (like boldness) reset. text_colors have_color = false - default_color_warn = :yellow default_color_error = :light_red - default_color_info = :cyan if is_windows() default_color_input = :normal From 245abd39ea18d3b38cb96bbee355028788f98781 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Fri, 16 Dec 2016 11:15:38 +0100 Subject: [PATCH 6/7] Update NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 9e8282fcd03c7..81d2fb95fe3e7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -60,7 +60,7 @@ Library improvements Therefore, light versions of the colors are now supported. For the available colors see the help entry on `print_with_color`. -* The default color for info messages has been changed from blue to cyan and for warning messages from red to yellow. + * The default color for info messages has been changed from blue to cyan and for warning messages from red to yellow. This can be changed back to the original colors by setting the environment variables `JULIA_INFO_COLOR` to `"blue"` and `JULIA_WARN_COLOR` to `"red"`. One way of doing this is by adding for example `ENV["JULIA_INFO_COLOR"] = :blue` and `ENV["JULIA_WARN_COLOR"] = :red` to the `.juliarc.jl` file. For more information regarding customizing colors in the REPL, see this [manual section]( http://docs.julialang.org/en/latest/manual/interacting-with-julia/#customizing-colors). From 35faf2a4bed8cfa621e12b49d5861bfcaeca7a4c Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Fri, 16 Dec 2016 15:00:12 +0100 Subject: [PATCH 7/7] fix typo --- base/test.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/test.jl b/base/test.jl index bc5107ceb74e6..f5d9965bbfab6 100644 --- a/base/test.jl +++ b/base/test.jl @@ -140,7 +140,7 @@ type Broken <: Result orig_expr end function Base.show(io::IO, t::Broken) - print_with_color(:Base.warn_color(), io, "Test Broken\n"; bold = true) + print_with_color(Base.warn_color(), io, "Test Broken\n"; bold = true) if t.test_type == :skipped && !(t.orig_expr === nothing) println(io, " Skipped: ", t.orig_expr) elseif !(t.orig_expr === nothing)