Skip to content
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

Jump to bottom

Load Pkg if not already to reinstate missing package add prompt #52125

Merged
merged 4 commits into from
Mar 9, 2024
Merged

Load Pkg if not already to reinstate missing package add prompt #52125

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6fb01e
load Pkg if needed to reinstate missing package add prompt
IanButterworth Nov 11, 2023
2191b46
move later
IanButterworth Nov 11, 2023
387b385
Update stdlib/REPL/src/REPL.jl
IanButterworth Mar 9, 2024
9c1d08f
use require_stdlib
IanButterworth Mar 9, 2024
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
16 changes: 12 additions & 4 deletions stdlib/REPL/src/REPL.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,7 @@ function eval_user_input(@nospecialize(ast), backend::REPLBackend, mod::Module)
put!(backend.response_channel, Pair{Any, Bool}(lasterr, true))
else
backend.in_eval = true
if !isempty(install_packages_hooks)
check_for_missing_packages_and_run_hooks(ast)
end
check_for_missing_packages_and_run_hooks(ast)
for xf in backend.ast_transforms
ast = Base.invokelatest(xf, ast)
end
Expand All @@ -251,6 +249,7 @@ function check_for_missing_packages_and_run_hooks(ast)
mods = modules_to_be_loaded(ast)
filter!(mod -> isnothing(Base.identify_package(String(mod))), mods) # keep missing modules
if !isempty(mods)
isempty(install_packages_hooks) && load_pkg()
for f in install_packages_hooks
Base.invokelatest(f, mods) && return
end
Expand Down Expand Up @@ -1586,6 +1585,16 @@ function run_frontend(repl::StreamREPL, backend::REPLBackendRef)
nothing
end

function load_pkg()
Base.generating_output(true) && return nothing
pkgid = Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg")
IanButterworth marked this conversation as resolved.
Show resolved Hide resolved
if Base.locate_package(pkgid) !== nothing # Only try load Pkg if we can find it
Pkg = Base.require(pkgid)
IanButterworth marked this conversation as resolved.
Show resolved Hide resolved
return Pkg
end
return nothing
end

module Numbered

using ..REPL
Expand Down Expand Up @@ -1658,7 +1667,6 @@ function __current_ast_transforms(backend)
end
end


function numbered_prompt!(repl::LineEditREPL=Base.active_repl, backend=nothing)
n = Ref{Int}(0)
set_prompt(repl, n)
Expand Down