wip

Author: charleskawczynski

TypedSyntax/src/show.jl

@@ -32,8 +32,7 @@ end
 function Base.printstyled(io::IO, rootnode::MaybeTypedSyntaxNode;
                           type_annotations::Bool=true, iswarn::Bool=true, hide_type_stable::Bool=true,
                           with_linenumber::Bool=true,
-                          idxend = last_byte(rootnode)
-                          )
+                          idxend = last_byte(rootnode))
     rt = gettyp(rootnode)
     nd = with_linenumber ? ndigits_linenumbers(rootnode, idxend) : 0
     rootnode = get_function_def(rootnode)
@@ -157,7 +156,9 @@ function show_annotation(io, @nospecialize(T), post, node, position; iswarn::Boo
     if isa(T, Core.Const) && isa(T.val, Type)
         T = Type{T.val}
     end
-    T_str = string(T)
+    T_str_long = string(T)
+    sz = get(io, :displaysize, displaysize(io))::Tuple{Int, Int}
+    T_str = Base.type_depth_limit(T_str_long, max(sz[2], 120); maxdepth=maxtypedepth)
     if iswarn && is_type_unstable(T)
         color = is_small_union_or_tunion(T) ? :yellow : :red
         printstyled(io, "::", T_str; color)

src/codeview.jl

@@ -189,7 +189,7 @@ function cthulhu_typed(io::IO, debuginfo::Symbol,
 
             callsite_diagnostics = TypedSyntax.Diagnostic[]
             if (diagnostics_vscode || inlay_types_vscode)
-                vscode_io = IOContext(devnull, :inlay_hints=>vscode_io[:inlay_hints], :diagnostics=>vscode_io[:diagnostics], maxtypedepth=CONFIG.type_depth_limit)
+                vscode_io = IOContext(devnull, :inlay_hints=>vscode_io[:inlay_hints], :diagnostics=>vscode_io[:diagnostics], :maxtypedepth=>CONFIG.type_depth_limit)
                 callsite_mis = Dict() # type annotation is a bit long so I skipped it, doesn't seem to affect performance
                 visited_mis = Set{MethodInstance}((mi,))
                 add_callsites!(callsite_mis, visited_mis, callsite_diagnostics, mi; optimize, annotate_source, interp)

test/runtests.jl

@@ -1,6 +1,9 @@
 using Test, PerformanceTestTools
 using Core: Const # allows correct printing as `Const` instead of `Core.Const`
 
+using Cthulhu
+Cthulhu.CONFIG.type_depth_limit = nothing # disable type-depth limit printing in tests
+
 @testset "runtests.jl" begin
     @testset "test_Cthulhu.jl" begin
         include("test_Cthulhu.jl")

test/test_depth_limited_type_printing.jl

@@ -3,20 +3,46 @@ using Revise; include(joinpath("test", "test_depth_limited_type_printing.jl"))
 =#
 import Cthulhu
 
+using Cthulhu
+Cthulhu.CONFIG.type_depth_limit = 2
+
 Base.@kwdef struct Nested{A,B}
     num::Int = 1
 end
-struct F49231{a,b,c,d,e,f,g}
-    num::g
-end;
 bar(x) = rand() > 0.5 ? x : Any[0][1]
 mysum(x) = sum(y-> bar(x.num), 1:5; init=0)
 nest_val(na, nb, ::Val{1}) = Nested{na, nb}()
 nest_val(na, nb, ::Val{n}) where {n} = nest_val(Nested{na, nb}, Nested{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)
+const NV = nest_val(5)
+
+# f = nest_val(5)
+# a = Any[f];
+# mysum(a[1]) # make sure it runs
+# Cthulhu.@descend mysum(a[1]) # navigate to sum -> sum, and Nested will be there
+using Test
+include("setup.jl")
+@testset "hide type-stable statements" begin
+    let # optimize code
+        # f = nest_val(5)
+        # a = Any[f];
+        # mysum(a[1]) # make sure it runs
+        # Cthulhu.@descend mysum(a[1]) # navigate to sum -> sum, and Nested will be there
+        (; src, infos, mi, rt, exct, effects, slottypes) = @eval Module() begin
+            $cthulhu_info($mysum, ($(typeof(NV)),))
+        end;
+        function prints(; kwargs...)
+            io = IOBuffer()
+            ioc = IOContext(io, :maxtypedepth => Cthulhu.CONFIG.type_depth_limit)
+            Cthulhu.cthulhu_typed(ioc, :none, src, rt, exct, effects, mi; kwargs...)
+            return String(take!(io))
+        end;
 
-f = nest_val(5)
-a = Any[f];
-mysum(a[1]) # make sure it runs
-Cthulhu.@descend mysum(a[1]) # navigate to sum -> sum, and F49231 will be there
+        let # by default, should print every statement
+            s = prints()
+            println(s)
+            # @test occursin("::Nested{Nested{…}, Nested{…}}", s)
+        end
+    end
+end