extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-11 00:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix exported module not found (#9121)

Browse Source
This commit is contained in:
Jakub Žádník 2023-05-06 23:55:10 +03:00 committed by GitHub
parent a2a346e39c
commit 0ea973b78b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -929,7 +929,7 @@ pub fn parse_export_in_block(
let (pipeline, _) = parse_use(working_set, &lite_command.parts); let (pipeline, _) = parse_use(working_set, &lite_command.parts);
pipeline pipeline
} }
b"export module" => parse_module(working_set, lite_command, None), b"export module" => parse_module(working_set, lite_command, None).0,
b"export extern" => parse_extern(working_set, lite_command, None), b"export extern" => parse_extern(working_set, lite_command, None),
_ => { _ => {
working_set.error(ParseError::UnexpectedKeyword( working_set.error(ParseError::UnexpectedKeyword(
@ -1270,7 +1270,8 @@ pub fn parse_export_in_module(
exportables exportables
} }
b"module" => { b"module" => {
let pipeline = parse_module(working_set, lite_command, Some(module_name)); let (pipeline, maybe_module_id) =
parse_module(working_set, lite_command, Some(module_name));
let export_module_decl_id = let export_module_decl_id =
if let Some(id) = working_set.find_decl(b"export module", &Type::Any) { if let Some(id) = working_set.find_decl(b"export module", &Type::Any) {
@ -1309,14 +1310,17 @@ pub fn parse_export_in_module(
let module_name = working_set.get_span_contents(*module_name_span); let module_name = working_set.get_span_contents(*module_name_span);
let module_name = trim_quotes(module_name); let module_name = trim_quotes(module_name);
if let Some(module_id) = working_set.find_module(module_name) { if let Some(module_id) = maybe_module_id {
result.push(Exportable::Module { result.push(Exportable::Module {
name: module_name.to_vec(), name: working_set.get_module(module_id).name(),
id: module_id, id: module_id,
}); });
} else { } else {
working_set.error(ParseError::InternalError( working_set.error(ParseError::InternalError(
"failed to find added module".into(), format!(
"failed to find added module '{}'",
String::from_utf8_lossy(module_name)
),
span(&spans[1..]), span(&spans[1..]),
)); ));
} }
@ -1529,7 +1533,7 @@ pub fn parse_module_block(
block.pipelines.push(pipeline) block.pipelines.push(pipeline)
} }
b"module" => { b"module" => {
let pipeline = parse_module( let (pipeline, _) = parse_module(
working_set, working_set,
command, command,
None, // using modules named as the module locally is OK None, // using modules named as the module locally is OK
@ -1865,7 +1869,7 @@ pub fn parse_module(
working_set: &mut StateWorkingSet, working_set: &mut StateWorkingSet,
lite_command: &LiteCommand, lite_command: &LiteCommand,
module_name: Option<&[u8]>, module_name: Option<&[u8]>,
) -> Pipeline { ) -> (Pipeline, Option<ModuleId>) {
// TODO: Currently, module is closing over its parent scope (i.e., defs in the parent scope are // TODO: Currently, module is closing over its parent scope (i.e., defs in the parent scope are
// visible and usable in this module's scope). We want to disable that for files. // visible and usable in this module's scope). We want to disable that for files.
@ -1891,12 +1895,15 @@ pub fn parse_module(
let starting_error_count = working_set.parse_errors.len(); let starting_error_count = working_set.parse_errors.len();
check_call(working_set, call_span, &decl.signature(), &call); check_call(working_set, call_span, &decl.signature(), &call);
if starting_error_count != working_set.parse_errors.len() || call.has_flag("help") { if starting_error_count != working_set.parse_errors.len() || call.has_flag("help") {
return Pipeline::from_vec(vec![Expression { return (
expr: Expr::Call(call), Pipeline::from_vec(vec![Expression {
span: call_span, expr: Expr::Call(call),
ty: output, span: call_span,
custom_completion: None, ty: output,
}]); custom_completion: None,
}]),
None,
);
} }
(call, call_span) (call, call_span)
@ -1906,7 +1913,7 @@ pub fn parse_module(
"internal error: 'module' or 'export module' declaration not found".into(), "internal error: 'module' or 'export module' declaration not found".into(),
span(spans), span(spans),
)); ));
return garbage_pipeline(spans); return (garbage_pipeline(spans), None);
} }
}; };
@ -1921,12 +1928,15 @@ pub fn parse_module(
"mod".to_string(), "mod".to_string(),
name.span, name.span,
)); ));
return Pipeline::from_vec(vec![Expression { return (
expr: Expr::Call(call), Pipeline::from_vec(vec![Expression {
span: call_span, expr: Expr::Call(call),
ty: Type::Any, span: call_span,
custom_completion: None, ty: Type::Any,
}]); custom_completion: None,
}]),
None,
);
} }
} }
(s, name.span, name.clone()) (s, name.span, name.clone())
@ -1935,14 +1945,14 @@ pub fn parse_module(
"internal error: name not a string".into(), "internal error: name not a string".into(),
span(spans), span(spans),
)); ));
return garbage_pipeline(spans); return (garbage_pipeline(spans), None);
} }
} else { } else {
working_set.error(ParseError::UnknownState( working_set.error(ParseError::UnknownState(
"internal error: missing positional".into(), "internal error: missing positional".into(),
span(spans), span(spans),
)); ));
return garbage_pipeline(spans); return (garbage_pipeline(spans), None);
}; };
let pipeline = Pipeline::from_vec(vec![Expression { let pipeline = Pipeline::from_vec(vec![Expression {
@ -1959,16 +1969,16 @@ pub fn parse_module(
find_in_dirs(&module_name_or_path, working_set, &cwd, LIB_DIRS_VAR) find_in_dirs(&module_name_or_path, working_set, &cwd, LIB_DIRS_VAR)
{ {
let path_str = module_path.to_string_lossy().to_string(); let path_str = module_path.to_string_lossy().to_string();
let _ = parse_module_file_or_dir( let maybe_module_id = parse_module_file_or_dir(
working_set, working_set,
path_str.as_bytes(), path_str.as_bytes(),
module_name_or_path_span, module_name_or_path_span,
None, None,
); );
return pipeline; return (pipeline, maybe_module_id);
} else { } else {
working_set.error(ParseError::ModuleNotFound(module_name_or_path_span)); working_set.error(ParseError::ModuleNotFound(module_name_or_path_span));
return pipeline; return (pipeline, None);
} }
} }
@ -1978,7 +1988,7 @@ pub fn parse_module(
span(spans), span(spans),
)); ));
return garbage_pipeline(spans); return (garbage_pipeline(spans), None);
} }
let module_name = module_name_or_path; let module_name = module_name_or_path;
@ -1992,7 +2002,7 @@ pub fn parse_module(
start += 1; start += 1;
} else { } else {
working_set.error(ParseError::Expected("block".into(), block_span)); working_set.error(ParseError::Expected("block".into(), block_span));
return garbage_pipeline(spans); return (garbage_pipeline(spans), None);
} }
if block_bytes.ends_with(b"}") { if block_bytes.ends_with(b"}") {
@ -2009,7 +2019,7 @@ pub fn parse_module(
let block_id = working_set.add_block(block); let block_id = working_set.add_block(block);
module_comments.extend(inner_comments); module_comments.extend(inner_comments);
let _ = working_set.add_module(&module_name, module, module_comments); let module_id = working_set.add_module(&module_name, module, module_comments);
let block_expr = Expression { let block_expr = Expression {
expr: Expr::Block(block_id), expr: Expr::Block(block_id),
@ -2034,12 +2044,15 @@ pub fn parse_module(
parser_info: HashMap::new(), parser_info: HashMap::new(),
}); });
Pipeline::from_vec(vec![Expression { (
expr: Expr::Call(call), Pipeline::from_vec(vec![Expression {
span: span(spans), expr: Expr::Call(call),
ty: Type::Any, span: span(spans),
custom_completion: None, ty: Type::Any,
}]) custom_completion: None,
}]),
Some(module_id),
)
} }
pub fn parse_use(working_set: &mut StateWorkingSet, spans: &[Span]) -> (Pipeline, Vec<Exportable>) { pub fn parse_use(working_set: &mut StateWorkingSet, spans: &[Span]) -> (Pipeline, Vec<Exportable>) {

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

@ -5198,7 +5198,7 @@ pub fn parse_builtin_commands(
Pipeline::from_vec(vec![expr]) Pipeline::from_vec(vec![expr])
} }
b"alias" => parse_alias(working_set, lite_command, None), b"alias" => parse_alias(working_set, lite_command, None),
b"module" => parse_module(working_set, lite_command, None), b"module" => parse_module(working_set, lite_command, None).0,
b"use" => { b"use" => {
let (pipeline, _) = parse_use(working_set, &lite_command.parts); let (pipeline, _) = parse_use(working_set, &lite_command.parts);
pipeline pipeline

1
tests/modules/samples/spam/eggs.nu Normal file
View File

@ -0,0 +1 @@
export def main [] { 'eggs' }

2
tests/modules/samples/spam/mod.nu
View File

@ -1,3 +1,5 @@
export module eggs.nu
export def main [] { 'spam' } export def main [] { 'spam' }
export def baz [] { 'spambaz' } export def baz [] { 'spambaz' }