Merge pull request #723 from timholy/teh/codeedges

Author: timholy

.github/workflows/ci.yml

@@ -57,8 +57,11 @@ jobs:
           while !isdefined(Base, :active_repl_backend) sleep(0.1) end
           pushfirst!(Base.active_repl_backend.ast_transforms, Revise.revise_first)
           include(joinpath("test", "runtests.jl"))
-          REPL.eval_user_input(:(exit()), Base.active_repl_backend)
-        ' "Methods at REPL"
+          if Base.VERSION.major == 1 && Base.VERSION.minor >= 9
+              REPL.eval_user_input(:(exit()), Base.active_repl_backend, Main)
+          else
+              REPL.eval_user_input(:(exit()), Base.active_repl_backend)
+          end' "Methods at REPL"
         # Tests for out-of-process updates to manifest
         bash test/envs/use_exputils/setup.sh
         julia --project --code-coverage=user test/envs/use_exputils/switch_version.jl

Project.toml

@@ -1,6 +1,6 @@
 name = "Revise"
 uuid = "295af30f-e4ad-537b-8983-00126c2a3abe"
-version = "3.4.0"
+version = "3.5.0"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
@@ -19,7 +19,7 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 [compat]
 CodeTracking = "1.1"
 JuliaInterpreter = "0.9"
-LoweredCodeUtils = "2.2"
+LoweredCodeUtils = "2.3"
 OrderedCollections = "1"
 # Exclude Requires-1.1.0 - see https://github.com/JuliaPackaging/Requires.jl/issues/94
 Requires = "~1.0, ^1.1.1"

src/lowered.jl

@@ -102,8 +102,8 @@ function minimal_evaluation!(@nospecialize(predicate), methodinfo, src::Core.Cod
     end
     # All tracked expressions are marked. Now add their dependencies.
     # LoweredCodeUtils.print_with_code(stdout, src, isrequired)
-    lines_required!(isrequired, src, edges;
-                    norequire=mode===:sigs ? LoweredCodeUtils.exclude_named_typedefs(src, edges) : ())
+    lines_required!(isrequired, src, edges;)
+                    # norequire=mode===:sigs ? LoweredCodeUtils.exclude_named_typedefs(src, edges) : ())
     # LoweredCodeUtils.print_with_code(stdout, src, isrequired)
     add_dependencies!(methodinfo, edges, src, isrequired)
     return isrequired, evalassign

src/packagedef.jl

@@ -1136,7 +1136,7 @@ function get_expressions(id::PkgId, filename)
     return fi.modexsigs
 end
 
-function add_definitions_from_repl(filename)
+function add_definitions_from_repl(filename::String)
     hist_idx = parse(Int, filename[6:end-1])
     hp = (Base.active_repl::REPL.LineEditREPL).interface.modes[1].hist::REPL.REPLHistoryProvider
     src = hp.history[hp.start_idx+hist_idx]
@@ -1149,6 +1149,7 @@ function add_definitions_from_repl(filename)
     push!(pkgdata, filename=>fi)
     return fi
 end
+add_definitions_from_repl(filename::AbstractString) = add_definitions_from_repl(convert(String, filename)::String)
 
 function update_stacktrace_lineno!(trace)
     local nrep

src/types.jl

@@ -163,12 +163,12 @@ function hasfile(info, file)
     fileindex(info, file) !== nothing
 end
 
-function fileinfo(pkgdata::PkgData, file::AbstractString)
+function fileinfo(pkgdata::PkgData, file::String)
     i = fileindex(pkgdata, file)
     i === nothing && error("file ", file, " not found")
     return pkgdata.fileinfos[i]
 end
-fileinfo(pkgdata::PkgData, i::Integer) = pkgdata.fileinfos[i]
+fileinfo(pkgdata::PkgData, i::Int) = pkgdata.fileinfos[i]
 
 function Base.push!(pkgdata::PkgData, pr::Pair{<:Any,FileInfo})
     push!(srcfiles(pkgdata), pr.first)

test/non_jl_test.jl

@@ -36,7 +36,7 @@ try
     cp(joinpath(@__DIR__, "fake_lang", "test.program"), path, force=true)
     m=MyFile(path)
     includet(m)
-    Revise.revise()
+    yry()    # comes from test/common.jl
     @test fake_lang.y() == "2"
     @test fake_lang.x() == "1"
     cp(joinpath(@__DIR__, "fake_lang", "new_test.program"), path, force=true)

test/runtests.jl

@@ -3621,7 +3621,7 @@ GC.gc(); GC.gc()
             end
         end
         msg = Revise.watching_files[] ? "is not an existing file" : "is not an existing directory"
-        isempty(ARGS) && @test occursin(msg, read(warnfile, String))
+        isempty(ARGS) && !Sys.isapple() && @test occursin(msg, read(warnfile, String))
         rm(warnfile)
     end
 end

test/sigtest.jl

@@ -56,6 +56,11 @@ function extracttype(T)
     isa(p1, TypeVar) && return p1.ub
     error("unrecognized type ", T)
 end
+if isdefined(Core, :TypeofVararg)
+    istva(T) = isa(T, Core.TypeofVararg)
+else
+    istva(T) = false
+end
 function in_module_or_core(T, mod::Module)
     if isa(T, TypeVar)
         return in_module_or_core(T.ub, mod)
@@ -68,6 +73,10 @@ function in_module_or_core(T, mod::Module)
         in_module_or_core(T.a, mod) || return false
         return in_module_or_core(T.b, mod)
     end
+    if istva(T)
+        isdefined(T, :T) || return true
+        return in_module_or_core(T.T, mod)
+    end
     Tname = T.name
     if Tname.name === :Type
         return in_module_or_core(extracttype(T), mod)
@@ -111,4 +120,14 @@ for sig in failed
     all(T->in_module_or_core(T, Base), Base.unwrap_unionall(sig).parameters[2:end]) || continue
     push!(realfailed, sig)
 end
-@test length(realfailed) < 40  # big enough for some cushion in case new "difficult" methods get added
+if false   # change to true to see the failures
+    world = Base.get_world_counter()
+    for tt in realfailed
+        println(tt)
+        mms = Base._methods_by_ftype(tt, -1, world)
+        for mm in mms
+            println(mm.method)
+        end
+    end
+end
+@test length(realfailed) < 60  # big enough for some cushion in case new "difficult" methods get added