Handle interpolated arguments (#110)

Fixes JuliaDebug/Cthulhu.jl#425

Author: timholy

Project.toml

@@ -1,7 +1,7 @@
 name = "CodeTracking"
 uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
 authors = ["Tim Holy <[email protected]>"]
-version = "1.3.0"
+version = "1.3.1"
 
 [deps]
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

src/utils.jl

@@ -118,6 +118,7 @@ function is_func_expr(@nospecialize(ex), meth::Method)
         margs = margs[idx:end]
     end
     for (arg, marg) in zip(exargs, margs[2:end])
+        isexpr(arg, :$) && continue
         aname = get_argname(arg)
         aname === :_ && continue
         aname === marg || (aname === Symbol("#unused#") && marg === Symbol("")) || return false

test/runtests.jl

@@ -202,40 +202,44 @@ isdefined(Main, :Revise) ? Main.Revise.includet("script.jl") : include("script.j
     src, line = definition(String, m)
     @test occursin("xf", src)
     @test line == 85
+    m = which(dollaratan, (Real, Real))
+    src, line = definition(String, m)
+    @test occursin("atan(y, x)", src)
+    @test line == 93
 
     # unnamed arguments
     m = which(unnamedarg, (Type{String}, Any))
     src, line = definition(String, m)
     @test occursin("string(x)", src)
-    @test line == 93
+    @test line == 98
     m = which(mypush!, (Nowhere, Any))
     src, line = definition(String, m)
     @test occursin("::Nowhere", src)
-    @test line == 108
+    @test line == 113
 
     # global annotations
     m = which(inlet, (Any,))
     src, line = definition(String, m)
     @test occursin("inlet(x)", src)
-    @test line == 112
+    @test line == 117
 
     # Callables
     gg = Gaussian(1.0)
     m = @which gg(2)
     src, line = definition(String, m)
     @test occursin("::Gaussian)(x)", src)
-    @test line == 119
+    @test line == 124
     invt = Invert()
     m = @which invt([false, true])
     src, line = definition(String, m)
     @test occursin("::Invert)(v", src)
-    @test line == 121
+    @test line == 126
 
     # Constructor with `where`
     m = @which Invert((false, true))
     src, line = definition(String, m)
     @test occursin("(::Type{T})(itr) where {T<:Invert}", src)
-    @test line == 122
+    @test line == 127
 
     # Invalidation-insulating methods used by Revise and perhaps others
     d = IdDict{Union{String,Symbol},Union{Function,Vector{Function}}}()

test/script.jl

@@ -89,6 +89,11 @@ for f in (:mysin,)
     end
 end
 mysin(x::AbstractFloat) = sin(x)
+let args = [:(y::Real), :(x::Real)]
+    @eval function dollaratan($(args...))
+        return atan(y, x)
+    end
+end
 
 unnamedarg(::Type{String}, x) = string(x)   # see more unnamed on line 108