extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 12:46:00 +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

8
crates/nu-parser/src/parse_keywords.rs
View File

@ -1116,12 +1116,13 @@ pub fn parse_use(
error = error.or(err);
let _ = working_set.add_block(block);
let _ = working_set.add_overlay(&module_name, overlay.clone());
let overlay_id = working_set.add_overlay(&module_name, overlay.clone());
(
ImportPattern {
head: ImportPatternHead {
name: module_name.into(),
id: Some(overlay_id),
span: spans[1],
},
members: import_pattern.members,
@ -1141,10 +1142,7 @@ pub fn parse_use(
);
}
} else {
error = error.or(Some(ParseError::FileNotFound(
module_filename,
import_pattern.head.span,
)));
error = error.or(Some(ParseError::ModuleNotFound(import_pattern.head.span)));
(ImportPattern::new(), Overlay::new())
}
} else {

7
crates/nu-parser/src/parser.rs
View File

@ -2093,6 +2093,8 @@ pub fn parse_import_pattern(
);
};
let maybe_overlay_id = working_set.find_overlay(&head);
let (import_pattern, err) = if let Some(tail_span) = spans.get(1) {
// FIXME: expand this to handle deeper imports once we support module imports
let tail = working_set.get_span_contents(*tail_span);
@ -2101,6 +2103,7 @@ pub fn parse_import_pattern(
ImportPattern {
head: ImportPatternHead {
name: head,
id: maybe_overlay_id,
span: *head_span,
},
members: vec![ImportPatternMember::Glob { span: *tail_span }],
@ -2129,6 +2132,7 @@ pub fn parse_import_pattern(
ImportPattern {
head: ImportPatternHead {
name: head,
id: maybe_overlay_id,
span: *head_span,
},
members: vec![ImportPatternMember::List { names: output }],
@ -2141,6 +2145,7 @@ pub fn parse_import_pattern(
ImportPattern {
head: ImportPatternHead {
name: head,
id: maybe_overlay_id,
span: *head_span,
},
members: vec![],
@ -2155,6 +2160,7 @@ pub fn parse_import_pattern(
ImportPattern {
head: ImportPatternHead {
name: head,
id: maybe_overlay_id,
span: *head_span,
},
members: vec![ImportPatternMember::Name {
@ -2171,6 +2177,7 @@ pub fn parse_import_pattern(
ImportPattern {
head: ImportPatternHead {
name: head,
id: maybe_overlay_id,
span: *head_span,
},
members: vec![],