Reimplement dummy pkg prompt as standard prompt #54674
Conversation
IanButterworth
added
REPL
IanButterworth
changed the title
|
We could also detect that return was pressed before load finished, and tell Pkg to execute the line once loaded. |
|
This PR fixes the issue!
Personally I would prefer Pkg execute the line once it's loaded like this comment suggests as that's what current 1.10 behaviour is like. |
|
@christiangnrd that's now implemented, can you give it another go. Thanks |
IanButterworth
changed the title
|
Talking about it with Jeff, I think the fake mode will also let us have the ability to render any history entries that are not currently loaded modes, though which error when you hit enter, and print in gray (or, in a few cases, such as Pkg, may load the package on some trigger, such as enter or |
|
Yeah I agree #51921 (comment) |
IanButterworth
changed the title
|
I've moved to standard tooling and implemented the history lookup as suggested |
IanButterworth
force-pushed
the
ib/pkg_switch_tweak
branch
2 times, most recently
from
32522d0
to
eb1036b
Compare
IanButterworth
force-pushed
the
ib/pkg_switch_tweak
branch
from
eb1036b
to
c653947
Compare
|
Recording some discussion with @IanButterworth in DM. REPL is not thread safe, so the thread trying to transition the main REPL does not work. I proposed a sketch along the lines of: to allow the REPL state machine to be driven asynchronously. |
|
This PR makes a big difference in how responsive 1.11 will feel. It'll no longer feel like a regression from 1.10 and I'll be able to remove the |
| @@ -2829,7 +2830,11 @@ function prompt!(term::TextTerminal, prompt::ModalInterface, s::MIState = init_s | |||
| old_state = mode(s) | |||
| while true | |||
| kmap = keymap(s, prompt) | |||
| fcn = match_input(kmap, s) | |||
| waitany(( | |||
There was a problem hiding this comment.
waitany() isn't in 1.11 unfortunately, so this can't be easily backported unless #53341 is backported too.
There was a problem hiding this comment.
@Keno @KristofferC I think it's reasonable to backport waitany so I've added the label.
IanButterworth
force-pushed
the
ib/pkg_switch_tweak
branch
from
1407918
to
93f7423
Compare
IanButterworth
added
the
merge me
|
I wonder if it would be worth to do a little bit of work to get a good guess on the project name for the prompt. The |
|
I think we'd either want it to be ... or correct. Maybe the Pkg functions that are used by REPLExt.promptf could be moved to Base? |
|
Could we use |
|
It could be empty instead |
|
To make the "unknown" aspect obvious while doing the padding, |
|
The |
|
So we move those Pkg functions to Base? Seems reasonable |
|
Yeah, or just basically copy paste it. There are some stuff with regards to workspaces that might have to be "ported" as well: |
(cherry picked from commit 77c28ab)
Backported PRs: - [x] #54361 <!-- [LBT] Upgrade to v5.9.0 --> - [x] #54474 <!-- Unalias source from dest in copytrito --> - [x] #54548 <!-- Fixes for bitcast bugs with LLVM 17 / opaque pointers --> - [x] #54191 <!-- make `AbstractPipe` public --> - [x] #53402 <!-- Add `jl_getaffinity` and `jl_setaffinity` --> - [x] #53356 <!-- Rename at-scriptdir project argument to at-script and search upwards for Project.toml --> - [x] #54545 <!-- typeintersect: fix incorrect innervar handling under circular env --> - [x] #54586 <!-- Set storage class of julia globals to dllimport on windows to avoid auto-import weirdness. Forward port of #54572 --> - [x] #54587 <!-- Accomodate for rectangular matrices in `copytrito!` --> - [x] #54617 <!-- CLI: Use `GetModuleHandleExW` to locate libjulia.dll --> - [x] #54605 <!-- Allow libquadmath to also fail as it is not available on all systems --> - [x] #54634 <!-- Fix trampoline assembly for build on clang 18 on apple silicon --> - [x] #54635 <!-- Aggressive constprop in trevc! to stabilize triangular eigvec --> - [x] #54645 <!-- ensure we set the right value to gc_first_tid --> - [x] #54554 <!-- make elsize public --> - [x] #54648 <!-- Construct LazyString in error paths for tridiag --> - [x] #54658 <!-- fix missing uuid check on extension when finding the location of an extension --> - [x] #54594 <!-- Switch to Pkg mode prompt immediately and load Pkg in the background --> - [x] #54669 <!-- Improve error message in inplace transpose --> - [x] #54671 <!-- Add boundscheck in bindingkey_eq to avoid OOB access due to data race --> - [x] #54672 <!-- make: Fix `sed` command for LLVM libraries with no symbol versioning --> - [x] #54624 <!-- more precise aliasing checks for SubArray --> - [x] #54679 <!-- 🤖 [master] Bump the Distributed stdlib from 6a07d98 to 6c7cdb5 --> - [x] #54604 <!-- Fix tbaa annotation on union selector bytes inside of structs --> - [x] #54690 <!-- Fix assertion/crash when optimizing function with dead basic block --> - [x] #54704 <!-- LazyString in reinterpretarray error messages --> - [x] #54718 <!-- fix prepend StackOverflow issue --> - [x] #54674 <!-- Reimplement dummy pkg prompt as standard prompt --> - [x] #54737 <!-- LazyString in interpolated error messages involving types --> - [x] #54642 <!-- Document GenericMemory and AtomicMemory --> - [x] #54713 <!-- make: use `readelf` for LLVM symbol version detection --> - [x] #54760 <!-- REPL: improve prompt! async function handler --> - [x] #54606 <!-- fix double-counting and non-deterministic results in `summarysize` --> - [x] #54759 <!-- REPL: Fully populate the dummy Pkg prompt --> - [x] #54702 <!-- lowering: Recognize argument destructuring inside macro hygiene --> - [x] #54678 <!-- Don't let setglobal! implicitly create bindings --> - [x] #54730 <!-- Fix uuidkey of exts in fast path of `require_stdlib` --> - [x] #54765 <!-- Handle no-postdominator case in finalizer pass --> - [x] #54591 <!-- Don't expose guard pages to malloc_stack API consumers --> - [x] #54755 <!-- [TOML] remove Dates hack, replace with explicit usage --> - [x] #54721 <!-- add try/catch around scheduler to reset sleep state --> - [x] #54631 <!-- Avoid concatenating LazyString in setindex! for triangular matrices --> - [x] #54322 <!-- effects: add new `@consistent_overlay` macro --> - [x] #54785 - [x] #54865 - [x] #54815 - [x] #54795 - [x] #54779 - [x] #54837 Contains multiple commits, manual intervention needed: - [ ] #52694 <!-- Reinstate similar for AbstractQ for backward compatibility --> - [ ] #54649 <!-- Less restrictive copyto! signature for triangular matrices --> Non-merged PRs with backport label: - [ ] #54779 <!-- make recommendation clearer on manifest version mismatch --> - [ ] #54739 <!-- finish implementation of upgradable stdlibs --> - [ ] #54738 <!-- serialization: fix relocatability bug --> - [ ] #54574 <!-- Make ScopedValues public --> - [ ] #54457 <!-- Make `String(::Memory)` copy --> - [ ] #53957 <!-- tweak how filtering is done for what packages should be precompiled --> - [ ] #53452 <!-- RFC: allow Tuple{Union{}}, returning Union{} --> - [ ] #53286 <!-- Raise an error when using `include_dependency` with non-existent file or directory --> - [ ] #51479 <!-- prevent code loading from lookin in the versioned environment when building Julia -->
KristofferC
removed
the
backport 1.11
Follow-up on #54594 based on #54594 (comment) and review below
require_stdlibfast path for already loaded extsc653947(#54674)Depends on
require_stdlib#54730Closes #51921