A more colourful menu

src/ui.jl

@@ -47,15 +47,21 @@ end
 
 const debugcolors = (:nothing, :light_black, :yellow)
 function usage(@nospecialize(view_cmd), optimize, iswarn, hide_type_stable, debuginfo, remarks, inline_cost, type_annotations, highlight)
-    colorize(iotmp, use_color::Bool, c::Char) = stringify(iotmp) do io
-        use_color ? printstyled(io, c; color=:cyan) : print(io, c)
+    colorize(iotmp, active_option::Bool, c::Char) = stringify(iotmp) do io
+        active_option ? printstyled(io, c; bold=true, color=:blue) :  printstyled(io, c; color=:magenta)
+    end
+
+    colorize(iotmp, s::AbstractString; color::Symbol = :cyan) = stringify(iotmp) do io
+        printstyled(io, s; color)
     end
 
     io, iotmp = IOBuffer(), IOBuffer()
     ioctx = IOContext(io, :color=>true)
 
-    println(ioctx, "Select a call to descend into or ↩ to ascend. [q]uit. [b]ookmark.")
-    println(ioctx, "Toggles: [",
+    println(ioctx,
+        colorize(iotmp, "Select a call to descend into or ↩ to ascend. [q]uit. [b]ookmark."; color=:green))
+    println(ioctx,
+        colorize(iotmp, "Toggles"), ": [",
         colorize(iotmp, optimize, 'o'), "]ptimize, [",
         colorize(iotmp, iswarn, 'w'), "]arn, [",
         colorize(iotmp, hide_type_stable, 'h'), "]ide type-stable statements, [",
@@ -66,16 +72,18 @@ function usage(@nospecialize(view_cmd), optimize, iswarn, hide_type_stable, debu
         colorize(iotmp, inline_cost, 'i'), "]nlining costs, [",
         colorize(iotmp, type_annotations, 't'), "]ype annotations, [",
         colorize(iotmp, highlight, 's'), "]yntax highlight for Source/LLVM/Native.")
-    println(ioctx, "Show: [",
+    println(ioctx,
+        colorize(iotmp, "Show"), ": [",
         colorize(iotmp, view_cmd === cthulhu_source, 'S'), "]ource code, [",
         colorize(iotmp, view_cmd === cthulhu_ast, 'A'), "]ST, [",
         colorize(iotmp, view_cmd === cthulhu_typed, 'T'), "]yped code, [",
         colorize(iotmp, view_cmd === cthulhu_llvm, 'L'), "]LVM IR, [",
         colorize(iotmp, view_cmd === cthulhu_native, 'N'), "]ative code")
     print(ioctx,
-    """
-    Actions: [E]dit source code, [R]evise and redisplay
-    Advanced: dump [P]arams cache.""")
+        colorize(iotmp, "Actions"),
+        ": [E]dit source code, [R]evise and redisplay\n",
+        colorize(iotmp, "Advanced"),
+        ": dump [P]arams cache.")
     return String(take!(io))
 end
 

test/terminal.jl

@@ -29,9 +29,14 @@ const keydict = Dict(:up => "\e[A",
     if isdefined(Base, :active_repl)
         @test Cthulhu.default_terminal() isa REPL.Terminals.TTYTerminal
     end
-    colorize(use_color::Bool, c::Char) = Cthulhu.stringify() do io
-        use_color ? printstyled(io, c; color=:cyan) : print(io, c)
+    colorize(active_option::Bool, c::Char) = Cthulhu.stringify() do io
+        active_option ? printstyled(io, c; bold=true, color=:blue) : printstyled(io, c; color=:magenta)
     end
+
+    colorize(s::AbstractString; color::Symbol = :cyan) = Cthulhu.stringify() do io
+        printstyled(io, s; color)
+    end
+
     # Write a file that we track with Revise. Creating it programmatically allows us to rewrite it with
     # different content
     fn = tempname()
@@ -64,14 +69,14 @@ const keydict = Dict(:up => "\e[A",
             @test occursin('[' * colorize(true, 'o') * "]ptimize", lines)
             @test occursin('[' * colorize(true, 'T') * "]yped", lines)
 
-            @test occursin("\nSelect a call to descend into", lines)   # beginning of the line
+            @test occursin('\n' * colorize("Select a call to descend into or ↩ to ascend. [q]uit. [b]ookmark."; color = :green), lines)   # beginning of the line
             @test occursin('•', lines)
             write(in, 'o')            # switch to unoptimized
             lines = cread(out)
             @test occursin("invoke simplef(::Float32,::Int32)::Float32", lines)
             @test occursin(r"\(z = a \* a\)\u001B\[\d\dm::Float32\u001B\[39m", lines)
             @test occursin('[' * colorize(false, 'o') * "]ptimize", lines)
-            @test occursin("\nSelect a call to descend into", lines)   # beginning of the line
+            @test occursin('\n' * colorize("Select a call to descend into or ↩ to ascend. [q]uit. [b]ookmark."; color = :green), lines)   # beginning of the line
             @test occursin("• %1  = *(::Float32,::Float32)::Float32", lines)
             # Call selection
             write(in, keydict[:down])
@@ -103,7 +108,7 @@ const keydict = Dict(:up => "\e[A",
             @test occursin(r"z.*::Float32", lines)
             @test occursin(r"\nBody.*Float32", lines)
             @test occursin('[' * colorize(true, 'w') * "]arn", lines)
-            @test occursin("\nSelect a call to descend into", lines)   # beginning of the line
+            @test occursin('\n' * colorize("Select a call to descend into or ↩ to ascend. [q]uit. [b]ookmark."; color = :green), lines)   # beginning of the line
             @test occursin("• %1  = *(::Float32,::Float32)::Float32", lines)
             # Source view
             write(in, 'S')
@@ -146,7 +151,7 @@ const keydict = Dict(:up => "\e[A",
             write(in, 'd'); cread(out)
             write(in, 'L')
             lines = cread(out)
-            @test occursin('[' * colorize(false, 'd') * "]ebuginfo", lines)
+            @test occursin("[d]ebuginfo", lines)
             @test !occursin("┌ @ promotion.jl", lines)
             # Native-code view
             write(in, 'N')