Missing package add prompt: Restrict which exprs to search in #43457
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aviatesk
reviewed
Dec 17, 2021
stdlib/REPL/src/REPL.jl
Outdated
| @@ -194,6 +194,7 @@ function modules_to_be_loaded(ast::Expr, mods::Vector{Symbol} = Symbol[]) | |||
| end | |||
| end | |||
| for arg in ast.args | |||
| arg == Symbol("@eval") && break # don't search beyond an `@eval` | |||
There was a problem hiding this comment.
The same kind of situation will also happen for Core.eval(xxx, ...) as well as xxx.eval(...).
There was a problem hiding this comment.
@simeonschaub's suggestion below seems clean so I've gone for that
|
Instead of recursing into any expression, could we not just recurse into |
IanButterworth
force-pushed
the
ib/pkg_add_prompt_dont_eval
branch
from
0ec75fe
to
6ba8680
Compare
IanButterworth
changed the title
@eval
KristofferC
pushed a commit
that referenced
this pull request
Jan 5, 2022
(cherry picked from commit 8f192bd)
23 tasks
vtjnash
reviewed
Jan 7, 2022
| @@ -194,7 +194,9 @@ function modules_to_be_loaded(ast::Expr, mods::Vector{Symbol} = Symbol[]) | |||
| end | |||
| end | |||
| for arg in ast.args | |||
| arg isa Expr && modules_to_be_loaded(arg, mods) | |||
| if arg isa Expr && arg.head in [:block, :if, :using, :import] | |||
There was a problem hiding this comment.
Suggested change
| if arg isa Expr && arg.head in [:block, :if, :using, :import] | |
| if arg isa Expr && arg.head in (:block, :if, :using, :import) |
The [] form allocates the same tuple as above, then splats it to a new array, on every iteration of the loop.
There was a problem hiding this comment.
Or even more concisely:
Suggested change
| if arg isa Expr && arg.head in [:block, :if, :using, :import] | |
| if isexpr(arg, (:block, :if, :using, :import)) |
There was a problem hiding this comment.
Makes sense, thanks #43708
LilithHafner
pushed a commit
to LilithHafner/julia
that referenced
this pull request
Feb 22, 2022
LilithHafner
pushed a commit
to LilithHafner/julia
that referenced
this pull request
Mar 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #43446
.. by not looking beyond an
@evalwhen collecting a list of modules that are going to be loaded for the missing package install prompt.