extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 05:04:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use overlay ID for module import lookup (#4514)

Browse Source 
* Add id to import pattern

* Finish testing importing in a block
This commit is contained in:
Jakub Žádník
2022-02-18 03:58:24 +02:00
committed by GitHub
parent c7c427723b
commit bccce0ab46
6 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-command/src/core_commands/use_.rs
View File

@ -42,7 +42,7 @@ impl Command for Use {
));
};
if let Some(overlay_id) = engine_state.find_overlay(&import_pattern.head.name) {
if let Some(overlay_id) = import_pattern.head.id {
let overlay = engine_state.get_overlay(overlay_id);
let env_vars_to_use = if import_pattern.members.is_empty() {
@ -102,14 +102,13 @@ impl Command for Use {
} else {
// TODO: This is a workaround since call.positional[0].span points at 0 for some reason
// when this error is triggered
let bytes = engine_state.get_span_contents(&call.positional[0].span);
return Err(ShellError::SpannedLabeledError(
format!(
"Could not use '{}' import pattern",
String::from_utf8_lossy(bytes)
"Could not import from '{}'",
String::from_utf8_lossy(&import_pattern.head.name)
),
"called here".to_string(),
call.head,
"module does not exist".to_string(),
import_pattern.head.span,
));
}