cybercyst/nushell
1
0
Fork 0
mirror of https://github.com/nushell/nushell.git synced 2025-05-05 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

overlay use: keep PWD after activating the overlay thought file. (#15566)

Browse Source 
# Description
Fixes: #14048

The issue happened when re-using a ***module file***, and the overlay
already has already saved `PWD`, then nushell restores the `PWD`
variable after activating it.

This pr is going to fix it by restoring `PWD` after re-using a module
file.

# User-Facing Changes
`overlay use spam.nu` will always keep `PWD`, if `spam.nu` itself
doesn't change `PWD` while activating.

# Tests + Formatting
Added 2 tests.

# After Submitting
NaN
This commit is contained in:
Wind 2025-04-21 20:09:08 +08:00 committed by GitHub
parent a1497716f1
commit bae04352ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-cmd-lang/src/core_commands/overlay/use_.rs
View File

@ -116,6 +116,8 @@ impl Command for OverlayUse {
// b) refreshing an active overlay (the origin module changed)
let module = engine_state.get_module(module_id);
// in such case, should also make sure that PWD is not restored in old overlays.
let cwd = caller_stack.get_env_var(engine_state, "PWD").cloned();
// Evaluate the export-env block (if any) and keep its environment
if let Some(block_id) = module.env_block {
@ -160,11 +162,19 @@ impl Command for OverlayUse {
// The export-env block should see the env vars *before* activating this overlay
caller_stack.add_overlay(overlay_name);
// make sure that PWD is not restored in old overlays.
if let Some(cwd) = cwd {
caller_stack.add_env_var("PWD".to_string(), cwd);
}
// Merge the block's environment to the current stack
redirect_env(engine_state, caller_stack, &callee_stack);
} else {
caller_stack.add_overlay(overlay_name);
// make sure that PWD is not restored in old overlays.
if let Some(cwd) = cwd {
caller_stack.add_env_var("PWD".to_string(), cwd);
}
}
} else {
caller_stack.add_overlay(overlay_name);

36
tests/overlays/mod.rs
View File

@ -720,6 +720,42 @@ fn overlay_keep_pwd() {
assert_eq!(actual_repl.out, "samples");
}
#[test]
fn overlay_reactivate_with_nufile_should_not_change_pwd() {
let inp = &[
"overlay use spam.nu",
"cd ..",
"overlay hide --keep-env [ PWD ] spam",
"cd samples",
"overlay use spam.nu",
"$env.PWD | path basename",
];
let actual = nu!(cwd: "tests/overlays/samples", &inp.join("; "));
let actual_repl = nu!(cwd: "tests/overlays/samples", nu_repl_code(inp));
assert_eq!(actual.out, "samples");
assert_eq!(actual_repl.out, "samples");
}
#[test]
fn overlay_reactivate_with_module_name_should_change_pwd() {
let inp = &[
"overlay use spam.nu",
"cd ..",
"overlay hide --keep-env [ PWD ] spam",
"cd samples",
"overlay use spam",
"$env.PWD | path basename",
];
let actual = nu!(cwd: "tests/overlays/samples", &inp.join("; "));
let actual_repl = nu!(cwd: "tests/overlays/samples", nu_repl_code(inp));
assert_eq!(actual.out, "overlays");
assert_eq!(actual_repl.out, "overlays");
}
#[test]
fn overlay_wrong_rename_type() {
let inp = &["module spam {}", "overlay use spam as { echo foo }"];