Fixes

Author: charleskawczynski

base/show.jl

@@ -903,7 +903,7 @@ function make_typealiases(@nospecialize(x::Type))
     end
 end
 
-function show_unionaliases(io::IO, x::Union)
+function show_unionaliases(io::IO, x::Union, depth::Integer)
     properx = makeproper(io, x)
     aliases, applied = make_typealiases(properx)
     isempty(aliases) && return false
@@ -985,7 +985,7 @@ function _show_type(io::IO, @nospecialize(x::Type), depth::Int)
         show_datatype(io, x, TypeVar[], depth)
         return
     elseif x isa Union
-        if get(io, :compact, true)::Bool && show_unionaliases(io, x)
+        if get(io, :compact, true)::Bool && show_unionaliases(io, x, depth)
             return
         end
         print(io, "Union")
@@ -2771,23 +2771,26 @@ function type_depth_limit(str::String, n::Int; maxdepth = nothing)
     return String(take!(output))
 end
 
-function print_type_bicolor(io, @nospecialize(type); color=:normal, inner_color=:light_black, use_color::Bool=true, depth::Int)
-    if depth > max_type_depth(io)
+function print_type_bicolor(io, type; kwargs...)
+    depth > max_type_depth(io) && return nothing
+    str = sprint(show, type, context=io)
+    print_type_bicolor(io, str; kwargs...)
+end
+
+function print_type_bicolor(io, str::String; color=:normal, inner_color=:light_black, use_color::Bool=true, depth::Int = 0)
+    depth > max_type_depth(io) && return nothing
+    i = findfirst('{', str)
+    if !use_color # fix #41928
+        print(io, str)
+    elseif i === nothing
+        printstyled(io, str; color=color)
     else
-        str = sprint(show, type, context=io)
-        i = findfirst('{', str)
-        if !use_color # fix #41928
-            print(io, str)
-        elseif i === nothing
-            printstyled(io, str; color=color)
+        printstyled(io, str[1:prevind(str,i)]; color=color)
+        if endswith(str, "...")
+            printstyled(io, str[i:prevind(str,end,3)]; color=inner_color)
+            printstyled(io, "..."; color=color)
         else
-            printstyled(io, str[1:prevind(str,i)]; color=color)
-            if endswith(str, "...")
-                printstyled(io, str[i:prevind(str,end,3)]; color=inner_color)
-                printstyled(io, "..."; color=color)
-            else
-                printstyled(io, str[i:end]; color=inner_color)
-            end
+            printstyled(io, str[i:end]; color=inner_color)
         end
     end
 end
@@ -2818,7 +2821,7 @@ function ismodulecall(ex::Expr)
            isa(resolvebinding(ex.args[2]), Module)
 end
 
-function show(io::IO, tv::TypeVar)
+function show(io::IO, tv::TypeVar, depth::Int = 0)
     # If we are in the `unionall_env`, the type-variable is bound
     # and the type constraints are already printed.
     # We don't need to print it again.
@@ -2828,7 +2831,7 @@ function show(io::IO, tv::TypeVar)
     function show_bound(io::IO, @nospecialize(b))
         parens = isa(b,UnionAll) && !print_without_params(b)
         parens && print(io, "(")
-        show(io, b)
+        show(io, b, depth)
         parens && print(io, ")")
     end
     lb, ub = tv.lb, tv.ub
@@ -2852,14 +2855,14 @@ function show(io::IO, tv::TypeVar)
     nothing
 end
 
-function show(io::IO, vm::Core.TypeofVararg)
+function show(io::IO, vm::Core.TypeofVararg, depth::Int = 0)
     print(io, "Vararg")
     if isdefined(vm, :T)
         print(io, "{")
-        show(io, vm.T)
+        show(io, vm.T, depth + 1)
         if isdefined(vm, :N)
             print(io, ", ")
-            show(io, vm.N)
+            show(io, vm.N, depth)
         end
         print(io, "}")
     end

test/stacktraces.jl

@@ -270,6 +270,21 @@ end
     @show sprint(Base.show, typ, context = (:max_type_depth_limit => 6))
 end
 
+Base.@kwdef struct F55952{A,B}
+    num::Int = 1
+end
+
+@testset "Depth-limited type printing performance for highly nested types" begin
+    nest_val(na, nb, ::Val{1}) = F55952{na, nb}()
+    nest_val(na, nb, ::Val{n}) where {n} = nest_val(F55952{na, nb}, F55952{na, nb}, Val(n-1))
+    nest_val(na, nb, n::Int) = nest_val(na, nb, Val(n))
+    nest_val(n) = nest_val(1, 1, n)
+    typ = typeof(nest_val(23))
+    # be careful with changing to a larger number
+    # ~10 seconds before #55952 is fixed:
+    @test 1 > @elapsed sprint(Base.show, typ, context = (:max_type_depth_limit => 2))
+end
+
 @testset "Base.StackTraces docstrings" begin
     @test isempty(Docs.undocumented_names(StackTraces))
 end