extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-25 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix $env.FILE_PWD and $env.CURRENT_FILE inside use (#13958)" (#14057)

Browse Source 
This reverts commit 5002d87af4 from pr
#13958

It seems that something unexpected happened from
[@ealap](https://github.com/ealap)'s report. Thanks!

Reopen: #13425
This commit is contained in:
Wind 2024-10-11 14:45:42 +08:00 committed by GitHub
parent e43632fd95
commit 44be445b57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,21 +98,15 @@ This command is a parser keyword. For details, check:
engine_state.get_span_contents(import_pattern.head.span), engine_state.get_span_contents(import_pattern.head.span),
); );
let maybe_file_path_or_dir = find_in_dirs_env( let maybe_file_path = find_in_dirs_env(
&module_arg_str, &module_arg_str,
engine_state, engine_state,
caller_stack, caller_stack,
get_dirs_var_from_call(caller_stack, call), get_dirs_var_from_call(caller_stack, call),
)?; )?;
// module_arg_str maybe a directory, in this case let maybe_parent = maybe_file_path
// find_in_dirs_env returns a directory. .as_ref()
let maybe_parent = maybe_file_path_or_dir.as_ref().and_then(|path| { .and_then(|path| path.parent().map(|p| p.to_path_buf()));
if path.is_dir() {
Some(path.to_path_buf())
} else {
path.parent().map(|p| p.to_path_buf())
}
});
let mut callee_stack = caller_stack let mut callee_stack = caller_stack
.gather_captures(engine_state, &block.captures) .gather_captures(engine_state, &block.captures)
@ -124,15 +118,9 @@ This command is a parser keyword. For details, check:
callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd); callee_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
} }
if let Some(path) = maybe_file_path_or_dir { if let Some(file_path) = maybe_file_path {
let module_file_path = if path.is_dir() { let file_path = Value::string(file_path.to_string_lossy(), call.head);
// the existence of `mod.nu` is verified in parsing time callee_stack.add_env_var("CURRENT_FILE".to_string(), file_path);
// so it's safe to use it here.
Value::string(path.join("mod.nu").to_string_lossy(), call.head)
} else {
Value::string(path.to_string_lossy(), call.head)
};
callee_stack.add_env_var("CURRENT_FILE".to_string(), module_file_path);
} }
let eval_block = get_eval_block(engine_state); let eval_block = get_eval_block(engine_state);
@ -142,10 +130,6 @@ This command is a parser keyword. For details, check:
// Merge the block's environment to the current stack // Merge the block's environment to the current stack
redirect_env(engine_state, caller_stack, &callee_stack); redirect_env(engine_state, caller_stack, &callee_stack);
// File-reative PWD is useless after eval file block.
caller_stack.remove_env_var(engine_state, "FILE_PWD");
caller_stack.remove_env_var(engine_state, "CURRENT_FILE");
} }
} else { } else {
return Err(ShellError::GenericError { return Err(ShellError::GenericError {

44
crates/nu-command/tests/commands/use_.rs
View File

@ -308,47 +308,3 @@ fn can_use_sub_subname_from_submodule() {
let actual = nu!(inp); let actual = nu!(inp);
assert_eq!(actual.out, "bar") assert_eq!(actual.out, "bar")
} }
#[test]
fn test_use_with_printing_file_pwd() {
Playground::setup("use_with_printing_file_pwd", |dirs, nu| {
let file = dirs.test().join("mod.nu");
nu.with_files(&[FileWithContent(
file.as_os_str().to_str().unwrap(),
r#"
export-env {
print $env.FILE_PWD
}
"#,
)]);
let actual = nu!(
cwd: dirs.test(),
"use ."
);
assert_eq!(actual.out, dirs.test().to_string_lossy());
});
}
#[test]
fn test_use_with_printing_current_file() {
Playground::setup("use_with_printing_current_file", |dirs, nu| {
let file = dirs.test().join("mod.nu");
nu.with_files(&[FileWithContent(
file.as_os_str().to_str().unwrap(),
r#"
export-env {
print $env.CURRENT_FILE
}
"#,
)]);
let actual = nu!(
cwd: dirs.test(),
"use ."
);
assert_eq!(actual.out, dirs.test().join("mod.nu").to_string_lossy());
});
}