Skip to content

Support catch_stack API #240

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

Merged
merged 2 commits into from
Feb 17, 2019
Merged

Support catch_stack API #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcdd3e2
Support catch_stack API
tkf Feb 14, 2019
fd7f4c3
Use VERSION rather than existence of Base.catch_stack
tkf Feb 16, 2019
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
12 changes: 10 additions & 2 deletions src/Revise.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,15 +495,23 @@ function revise(backend::REPL.REPLBackend)
try
revise_file_now(pkgdata, file)
catch err
put!(backend.response_channel, (err, catch_backtrace()))
@static if VERSION >= v"1.2.0-DEV.253"
put!(backend.response_channel, (Base.catch_stack(), true))
else
put!(backend.response_channel, (err, catch_backtrace()))
end
end
end
empty!(revision_queue)
if tracking_Main_includes[]
try
queue_includes(Main)
catch err
put!(backend.response_channel, (err, catch_backtrace()))
@static if VERSION >= v"1.2.0-DEV.253"
put!(backend.response_channel, (Base.catch_stack(), true))
else
put!(backend.response_channel, (err, catch_backtrace()))
end
end
end
return nothing
Expand Down
6 changes: 5 additions & 1 deletion src/pkgs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,11 @@ function watch_manifest(mfile)
end
end
catch err
put!(Base.active_repl_backend.response_channel, (err, catch_backtrace()))
@static if VERSION >= v"1.2.0-DEV.253"
put!(Base.active_repl_backend.response_channel, (Base.catch_stack(), true))
else
put!(Base.active_repl_backend.response_channel, (err, catch_backtrace()))
end
end
return true
end