handle change in Base.active_repl_backend on 1.12

timholy · Jul 26, 2024 · e8820e4 · e8820e4
1 parent 8d9a05e
commit e8820e4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
         TERM="xterm" julia --project --code-coverage=user -e '
           using InteractiveUtils, REPL, Revise
           @async(Base.run_main_repl(true, true, false, true, false))
-          while !isdefined(Base, :active_repl_backend) sleep(0.1) end
+          while (!isdefined(Base, :active_repl_backend) || isnothing(Base.active_repl_backend)) sleep(0.1) end
           pushfirst!(Base.active_repl_backend.ast_transforms, Revise.revise_first)
           include(joinpath("test", "runtests.jl"))
           if Base.VERSION.major == 1 && Base.VERSION.minor >= 9

diff --git a/src/utils.jl b/src/utils.jl
@@ -145,6 +145,7 @@ task, so a `yield` will need to occur before it happens.
 """
 function throwto_repl(e::Exception)
     if isdefined(Base, :active_repl_backend) &&
+            !isnothing(Base.active_repl_backend) &&
             Base.active_repl_backend.backend_task.state === :runnable &&
             isempty(Base.Workqueue) &&
             Base.active_repl_backend.in_eval

diff --git a/test/start_late.jl b/test/start_late.jl
@@ -4,7 +4,7 @@
 using Test
 
 @async(Base.run_main_repl(true, true, false, true, false))
-while !isdefined(Base, :active_repl_backend)
+while !isdefined(Base, :active_repl_backend) || isnothing(Base.active_repl_backend)
     sleep(0.5)
 end