Merge pull request #36 from JuliaLang/cjf/printstyled_update

Some minor cleanups

Author: c42f

src/diagnostics.jl

@@ -89,7 +89,7 @@ function show_diagnostic(io::IO, diagnostic::Diagnostic, source::SourceFile)
         # a...............
         # .....p...q......
         # ...............b
-        _printstyled(io, source[p:q]; color=hicol)
+        _printstyled(io, source[p:q]; bgcolor=hicol)
     else
         # Or large and we trucate the code to show only the region around the
         # start and end of the error.
@@ -100,9 +100,9 @@ function show_diagnostic(io::IO, diagnostic::Diagnostic, source::SourceFile)
         # c...............
         # .....q..........
         # ...............d
-        _printstyled(io, source[p:b]; color=hicol)
+        _printstyled(io, source[p:b]; bgcolor=hicol)
         println(io, "…")
-        _printstyled(io, source[c:q]; color=hicol)
+        _printstyled(io, source[c:q]; bgcolor=hicol)
     end
     print(io, source[nextind(text,q):d])
     println(io)

src/parse_stream.jl

@@ -557,7 +557,15 @@ end
     bump(stream [, flags=EMPTY_FLAGS];
          skip_newlines=false, error, remap_kind)
 
-Shift the current token from the input to the output, adding the given flags.
+Copy the current token from the input stream to the output. Adds the given
+flags to the output token (normally this would be the default `EMPTY_FLAGS` or
+`TRIVIA_FLAG`).
+
+Keyword arguments:
+* `skip_newlines` - if `true`, newlines are treated as whitespace.
+* `error` - if set, emit an error for this token
+* `remap_kind` - the kind of the token in the output token stream if it needs
+                 to be modified.
 """
 function bump(stream::ParseStream, flags=EMPTY_FLAGS; skip_newlines=false,
               error=nothing, remap_kind::Kind=K"None")

src/syntax_tree.jl

@@ -253,7 +253,7 @@ function highlight(code::String, node, path::Int...; color=(40,40,70))
     node, p, span = child_position_span(node, path...)
     q = p + span
     print(stdout, code[1:p-1])
-    _printstyled(stdout, code[p:q-1]; color=color)
+    _printstyled(stdout, code[p:q-1]; bgcolor=color)
     print(stdout, code[q:end])
 end
 

src/utils.jl

@@ -2,11 +2,20 @@
 """
     Like printstyled, but allows providing RGB colors for true color terminals
 """
-function _printstyled(io::IO, text; color)
-    if length(color) != 3 || !all(0 .<= color .< 256)
-        error("Invalid ansi color $color")
+function _printstyled(io::IO, text; fgcolor=nothing, bgcolor=nothing)
+    colcode = ""
+    if !isnothing(fgcolor)
+        if length(fgcolor) != 3 || !all(0 .<= fgcolor .< 256)
+            error("Invalid ansi color $fgcolor")
+        end
+        colcode *= "\e[38;2;$(fgcolor[1]);$(fgcolor[2]);$(fgcolor[3])m"
+    end
+    if !isnothing(bgcolor)
+        if length(bgcolor) != 3 || !all(0 .<= bgcolor .< 256)
+            error("Invalid ansi color $bgcolor")
+        end
+        colcode *= "\e[48;2;$(bgcolor[1]);$(bgcolor[2]);$(bgcolor[3])m"
     end
-    colcode = "\e[48;2;$(color[1]);$(color[2]);$(color[3])m"
     colreset = "\e[0;0m"
     first = true
     for linepart in split(text, '\n')