allow CodeTracking v3 (#682)

Author: aviatesk

Project.toml

@@ -25,7 +25,7 @@ CthulhuCompilerExt = "Compiler"
 
 [compat]
 Accessors = "0.1.42"
-CodeTracking = "0.5, 1, 2"
+CodeTracking = "0.5, 1, 2, 3"
 Compiler = "0.1"
 FoldingTrees = "1"
 InteractiveUtils = "1.9"

TypedSyntax/Project.toml

@@ -8,7 +8,7 @@ CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
 JuliaSyntax = "70703baa-626e-46a2-a12c-08ffd08c73b4"
 
 [compat]
-CodeTracking = "1.3, 2"
+CodeTracking = "1.3, 2, 3"
 JuliaSyntax = "1"
 julia = "1.12"
 

TypedSyntax/src/TypedSyntax.jl

@@ -5,7 +5,7 @@ using JuliaSyntax: JuliaSyntax, AbstractSyntaxData, SyntaxData, SyntaxNode, Gree
                    head, kind, children, is_leaf, untokenize, first_byte, last_byte, source_line, source_location,
                    sourcetext, @K_str, @KSet_str, is_infix_op_call, is_prefix_op_call, is_prec_assignment, is_operator, is_literal
 using Base.Meta: isexpr
-using CodeTracking
+using CodeTracking: CodeTracking
 
 export TypedSyntaxNode
 

TypedSyntax/src/node.jl

@@ -27,7 +27,7 @@ end
 
 function tsn_and_mappings(mi::MethodInstance, src::CodeInfo, @nospecialize(rt); warn::Bool=true, strip_macros::Bool=false, kwargs...)
     m = mi.def::Method
-    def = definition(String, m)
+    def = CodeTracking.definition(String, m)
     if isnothing(def)
         warn && @warn "couldn't retrieve source of $m"
         return nothing, nothing

TypedSyntax/test/exhaustive.jl

@@ -3,7 +3,7 @@ using MethodAnalysis
 using ProgressMeter
 using Test
 using Logging
-using CodeTracking
+using CodeTracking: CodeTracking
 
 const missingmethods = Set{Method}()
 const badmis = Core.MethodInstance[]
@@ -20,7 +20,7 @@ const goodmis = Core.MethodInstance[]
             src, rt = cis[1]
             # Can CodeTracking handle this?
             ret = with_logger(NullLogger()) do
-                definition(String, m)
+                CodeTracking.definition(String, m)
             end
             if ret === nothing
                 push!(missingmethods, m)

ext/CthulhuCompilerExt.jl

@@ -7,7 +7,7 @@ using Cthulhu: Cthulhu
     using Compiler.IRShow: IRShow
 
     using Accessors
-    using CodeTracking: CodeTracking, definition, whereis, maybe_fix_path
+    using CodeTracking: CodeTracking
     using InteractiveUtils
     using UUIDs
     using REPL: REPL, AbstractTerminal

src/Cthulhu.jl

@@ -9,7 +9,7 @@ const CC = Base.Compiler
 const IRShow = Base.IRShow
 
 using Accessors
-using CodeTracking: CodeTracking, definition, whereis, maybe_fix_path
+using CodeTracking: CodeTracking
 using InteractiveUtils
 using InteractiveUtils: is_expected_union
 using UUIDs

src/ascend.jl

@@ -20,7 +20,7 @@ function ascend_impl(
                 parent = Cthulhu.instance(node.parent.data.nd)
                 ulocs = find_caller_of(provider, parent, mi; allow_unspecialized=true)
                 if !isempty(ulocs)
-                    ulocs = [(k[1], maybe_fix_path(String(k[2])), k[3]) => v for (k, v) in ulocs]
+                    ulocs = [(k[1], CodeTracking.maybe_fix_path(String(k[2])), k[3]) => v for (k, v) in ulocs]
                     strlocs = [string(" "^k[3] * '"', k[2], "\", ", k[1], ": lines ", v) for (k, v) in ulocs]
                     explain_inlining = length(ulocs) > 1 ? "(including inlined callers represented by indentation) " : ""
                     push!(strlocs, "Browse typed code")

src/compiler/codeview.jl

@@ -58,7 +58,7 @@ end
 function cthulhu_ast(io::IO, provider::AbstractProvider, state::CthulhuState, result::LookupResult)
     def = state.mi.def
     !isa(def, Method) && @warn "Can't show the AST because the definition is not a method."
-    ast = definition(Expr, def)
+    ast = CodeTracking.definition(Expr, def)
     ast === nothing && return @warn "Could not retrieve AST of $def. AST display requires Revise.jl to be loaded."
     if !state.config.pretty_ast
         dump(io, ast; maxdepth=typemax(Int))

src/descend.jl

@@ -69,9 +69,9 @@ function descend!(state::CthulhuState)
                 @warn "Can't jump to source location because the definition is not a method."
             else
                 if isdefined(Main, :VSCodeServer) && Main.VSCodeServer isa Module && isdefined(Main.VSCodeServer, :openfile)
-                    Main.VSCodeServer.openfile(whereis(def)...; preserve_focus=true)
+                    Main.VSCodeServer.openfile(CodeTracking.whereis(def)...; preserve_focus=true)
                 else
-                    edit(whereis(def)...)
+                    edit(CodeTracking.whereis(def)...)
                 end
             end
         end