Skip to content

Handle change in Base.active_repl_backend on 1.12 #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Handle change in Base.active_repl_backend on 1.12 #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/packagedef.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,18 +1330,18 @@ function __init__()
else
pushfirst!(REPL.repl_ast_transforms, revise_first)
# #664: once a REPL is started, it no longer interacts with REPL.repl_ast_transforms
if isdefined(Base, :active_repl_backend)
if isdefined(Base, :active_repl_backend) && !isnothing(Base.active_repl_backend)
push!(Base.active_repl_backend.ast_transforms, revise_first)
else
# wait for active_repl_backend to exist
# #719: do this async in case Revise is being loaded from startup.jl
t = @async begin
iter = 0
while !isdefined(Base, :active_repl_backend) && iter < 20
while (!isdefined(Base, :active_repl_backend) || isnothing(Base.active_repl_backend)) && iter < 20
sleep(0.05)
iter += 1
end
if isdefined(Base, :active_repl_backend)
if isdefined(Base, :active_repl_backend) && !isnothing(Base.active_repl_backend)
push!(Base.active_repl_backend.ast_transforms, revise_first)
end
end
Expand Down
1 change: 1 addition & 0 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/start_late.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down