Patch v2.0.1

Project.toml

@@ -1,7 +1,7 @@
 name = "Term"
 uuid = "22787eb5-b846-44ae-b979-8e399b8463ab"
 authors = ["FedeClaudi <federicoclaudi@protonmail.com> and contributors"]
-version = "2.0.1"
+version = "2.0.2"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/_errors.jl

@@ -220,6 +220,7 @@ function add_stack_frame!(
             source_file = RenderableText(
                 string(frame.file) * ":$(frame.line)";
                 style = "underline dim",
+                width = ctx.func_name_w,
             )
             _out = func_line / source_file
         else

src/link.jl

@@ -7,8 +7,7 @@ import ..Style: apply_style
 import ..Renderables: RenderableText, AbstractRenderable
 import ..Renderables
 import ..Layout: pad
-import Term:
-    get_relative_path, textlen, TERM_THEME, cleantext, excise_link_display_text, remove_ansi
+import Term: textlen, TERM_THEME, cleantext, excise_link_display_text, remove_ansi
 import Term
 
 export Link

src/logs.jl

@@ -182,16 +182,16 @@ Create string display for a log message value.
 function log_value_display end
 
 function log_value_display(x::AbstractArray)
-    a = highlight(str_trunc(string(x), 100); ignore_ansi = true)
+    a = highlight(str_trunc(string(x), 1000); ignore_ansi = true)
 
     s = foldl((a, b) -> a * " × " * b, string.(size(x)))
     b = highlight("{bold dim}Size:  $(s){/bold dim}"; ignore_ansi = true)
     return a * "\n" * b
 end
 
 log_value_display(x::AbstractDict) =
-    highlight(str_trunc(string(x), 100); ignore_ansi = true)
-log_value_display(x) = highlight(str_trunc(string(x), 100);)
+    highlight(str_trunc(string(x), 1000); ignore_ansi = true)
+log_value_display(x) = highlight(str_trunc(string(x), 1000);)
 
 """
     handle_message(logger::TermLogger, lvl, msg, _mod, group, id, file, line; kwargs...)

src/markdown.jl

@@ -176,7 +176,7 @@ function parse_md(
                "{$(theme.md_code)}`{/$(theme.md_code)}"
     else
         panel = Panel(
-            syntax;
+            RenderableText(syntax; style = "on_$(theme.md_codeblock_bg)");
             style = "white on_$(theme.md_codeblock_bg)",
             box = :SQUARE,
             subtitle = length(code.language) > 0 ? code.language : nothing,

src/panels.jl

@@ -192,7 +192,7 @@ content_as_renderable(
     justify::Symbol,
     background::Union{String,Nothing},
 )::RenderableText =
-    RenderableText(content, width = width - Δw, background = background, justify = justify)
+    RenderableText(content; width = width - Δw, background = background, justify = justify)
 
 """
 
@@ -225,7 +225,7 @@ function Panel(
     Δh = padding.top + padding.bottom
 
     # create content
-    # @info "panel fit" width height Δw Δh
+    # @info "panel fit" width height Δw Δh background
     content = content_as_renderable(content, width, Δw, justify, background)
 
     # estimate panel size
@@ -282,7 +282,7 @@ function Panel(
     content = content_as_renderable(content, width, Δw, justify, background)
     height = something(height, content.measure.h + Δh + 2)
     panel_measure = Measure(height, width)
-    # @info "panel nofit" width  Δw Δh height panel_measure
+    # @info "panel nofit" width  Δw Δh height panel_measure background content.measure
 
     # if the content is too tall, exclude some lines
     if content.measure.h > height - Δh - 2
@@ -292,6 +292,7 @@ function Panel(
             style = "dim",
             width = content.measure.w,
             justify = :center,
+            background = background,
         )
 
         segments = if lines_to_drop < content.measure.h

src/progress.jl

@@ -675,6 +675,7 @@ function foreachprogress(
     n = _getn(iter),
     transient = true,
     parallel = false,
+    columns_kwargs = Dict(),
     kwargs...,
 )
     task = nothing
@@ -687,9 +688,16 @@ function foreachprogress(
             start!(pbar)
             task = Threads.@spawn _startrenderloop(pbar)
         end
+        return
 
         # The job tracks the iteration through `iter`
-        job = addjob!(pbar; N = n, transient, kwargs...)
+        job = addjob!(
+            pbar;
+            N = n,
+            transient = transient,
+            columns_kwargs = columns_kwargs,
+            kwargs...,
+        )
         if parallel
             Threads.@threads for elem in iter
                 f(elem)

src/renderables.jl

@@ -143,8 +143,8 @@ function RenderableText(
     text = apply_style(text)
 
     style = isnothing(style) ? "" : style
-    background = isnothing(background) ? "" : get_bg_color(background)
-    style = style * background
+    # background = isnothing(background) ? "" : get_bg_color(background)
+    # style = style * background
 
     style_init, style_finish = get_style_codes(MarkupStyle(style))
 
@@ -168,7 +168,7 @@ function RenderableText(
         rt
     else
         text = join_lines([seg.text for seg in rt.segments])
-        RenderableText(text; style = style, width = width)
+        RenderableText(text; style = style, width = width, kwargs...)
     end
 end
 

src/trees.jl

@@ -138,6 +138,8 @@ function Tree(
     kwargs...,
 )
     _TREE_PRINTING_TITLE[] = title
+    _theme = TERM_THEME[]
+    TERM_THEME[] = theme
 
     # print tree
     guides = guides isa Symbol ? treeguides[guides] : guides
@@ -168,6 +170,9 @@ function Tree(
 
     # turn into a renderable
     rt = RenderableText(tree)
+
+    # restore theme
+    TERM_THEME[] = _theme
     return Tree(rt.segments, rt.measure)
 end
 

test/08_test_panel.jl

@@ -321,6 +321,17 @@ end
 end
 
 @testset "\e[34mPanel - background" begin
+    p = Panel(
+        RenderableText(
+            "testste";
+            style = "white on_red",
+            background = "on_blue",
+            width = 25,
+        );
+        background = "green",
+    )
+    IS_WIN || @compare_to_string p "panel_background_1"
+
     p = Panel(apply_style(
         """
     asasd
@@ -331,8 +342,7 @@ ads
         "on_blue",
     ); background = "on_red", fit = true)
 
-    @test string(p) ==
-          "\e[0m\e[22m╭──────────────────────╮\e[22m\e[0m\n\e[22m│\e[22m\e[41m  \e[49m\e[41m\e[44m    asasd\e[49m\e[41m         \e[49m\e[49m\e[41m  \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m  \e[49m\e[41m\e[44masdasadas\e[49m\e[41m         \e[49m\e[49m\e[41m  \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m  \e[49m\e[41m\e[44masdsasdasdsadasdsa\e[49m\e[49m\e[41m  \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m  \e[49m\e[41m\e[44mads\e[49m\e[41m               \e[49m\e[49m\e[41m  \e[49m\e[22m│\e[22m\n\e[22m│\e[22m\e[41m  \e[49m\e[41m\e[44m    \e[49m\e[41m              \e[49m\e[49m\e[41m  \e[49m\e[22m│\e[22m\n\e[0m\e[22m╰──────────────────────╯\e[22m\e[0m\e[0m"
+    IS_WIN || @compare_to_string p "panel_background_2"
 end
 
 @testset "\e[34mPANEL - UnicodePlots" begin

test/txtfiles/automatic_repr_showme_1.txt

@@ -9,14 +9,14 @@
 
 Method definition                                                               
 ┌────────────────────────────────────────────────────────────────────┐
-│  function tprint(io::IO, x::AbstractString; highlight = true)      │
-│      x = (highlight ? apply_style ∘ highlighter : apply_style)(    │
-│  x)                                                                │
-│                                                                    │
-│      x =                                                           │
-│          Measure(x).w <= console_width(io) ? x :                   │
-│          string(RenderableText(string(x), width = console_width    │
-│  (io)))                                                            │
-│      print(io, x)                                                  │
-│  end                                                               │
+│  function tprint(io::IO, x::AbstractString; highlight = true)      │
+│      x = (highlight ? apply_style ∘ highlighter : apply_style)(    │
+│  x)                                                                │
+│                                                                    │
+│      x =                                                           │
+│          Measure(x).w <= console_width(io) ? x :                   │
+│          string(RenderableText(string(x), width = console_width    │
+│  (io)))                                                            │
+│      print(io, x)                                                  │
+│  end                                                               │
 └────────────────────────────────────────────────────────────────────┘

test/txtfiles/markdown_3.txt

@@ -15,17 +15,17 @@ and footnotes {#9aacdb}[1]{/#9aacdb} for your content {#9aacdb}[named]{/#9aacdb}
 And, of course, you can show some code too:
 
     ┌──────────────────────────────────────────────┐
-    │  function say_hi(x)                          │
-    │      print("Hellow World")                   │
-    │  end                                         │
+    │  function say_hi(x)                          │
+    │      print("Hello World")                    │
+    │  end                                         │
     └──────────────────────────────────── julia ───┘
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 You can use "quotes" to highlight a section:
 
-  > “Multi-line quotes can be helpful to make a  paragram  
-  ┃ stand out, so that users                               
+  > “Multi-line quotes can be helpful to make a  paragraph 
+  ┃  stand out, so that users                              
   ┃ won't miss it! You can use other inline syntax in      
   ┃ you `quotes` too.”