refactor

Author: blindFS

crates/nu-parser/src/parse_keywords.rs

@@ -1368,7 +1368,7 @@ pub fn parse_export_in_block(
                     &parts[2..]
                 },
                 decl_id,
-                false,
+                true,
             );
             // don't need errors generated by parse_internal_call
             // further error will be generated by detail `parse_xxx` function.
@@ -2343,7 +2343,7 @@ pub fn parse_module(
         1
     };
 
-    let (call, call_span) = match working_set.find_decl(b"module") {
+    let (mut call, call_span) = match working_set.find_decl(b"module") {
         Some(decl_id) => {
             let (command_spans, rest_spans) = spans.split_at(split_id);
 
@@ -2431,12 +2431,7 @@ pub fn parse_module(
         };
 
     if spans.len() == split_id + 1 {
-        let call = Box::new(Call {
-            head: Span::concat(&spans[..split_id]),
-            decl_id: call.decl_id,
-            arguments: vec![Argument::Positional(module_name_or_path_expr)],
-            parser_info: HashMap::new(),
-        });
+        call.set_arguments(vec![Argument::Positional(module_name_or_path_expr)]);
 
         let pipeline = Pipeline::from_vec(vec![Expression::new(
             working_set,
@@ -2507,19 +2502,10 @@ pub fn parse_module(
         Type::Block,
     );
 
-    let module_decl_id = working_set
-        .find_decl(b"module")
-        .expect("internal error: missing module command");
-
-    let call = Box::new(Call {
-        head: Span::concat(&spans[..split_id]),
-        decl_id: module_decl_id,
-        arguments: vec![
-            Argument::Positional(module_name_or_path_expr),
-            Argument::Positional(block_expr),
-        ],
-        parser_info: HashMap::new(),
-    });
+    call.set_arguments(vec![
+        Argument::Positional(module_name_or_path_expr),
+        Argument::Positional(block_expr),
+    ]);
 
     (
         Pipeline::from_vec(vec![Expression::new(

crates/nu-parser/src/parser.rs

@@ -1270,7 +1270,7 @@ pub fn parse_internal_call(
                 continue;
             }
 
-            // HACK: avoid repeated parsing of argument values for special cases
+            // HACK: avoid repeated parsing of argument values in special cases
             // see https://github.com/nushell/nushell/issues/16398
             let arg = if lite {
                 Expression::garbage(working_set, spans[spans_idx])

crates/nu-protocol/src/ast/call.rs

@@ -222,6 +222,10 @@ impl Call {
         self.parser_info.insert(name, val)
     }
 
+    pub fn set_arguments(&mut self, args: Vec<Argument>) {
+        self.arguments = args;
+    }
+
     pub fn get_flag_expr(&self, flag_name: &str) -> Option<&Expression> {
         for name in self.named_iter().rev() {
             if flag_name == name.0.item {