From 233afebdf0bf4df9fedd8232da93c963ae91bc19 Mon Sep 17 00:00:00 2001
From: pwygab <88221256+merelymyself@users.noreply.github.com>
Date: Tue, 2 Aug 2022 23:26:16 +0800
Subject: [PATCH] allow `-h` flags for `export` subcommands (#6189)

* allow `-h` flags for `export` subcommands

* remove unnecessary check

* add tests

* fmt
---
 .../nu-command/tests/commands/export_def.rs   | 15 +++++++++++
 crates/nu-command/tests/commands/mod.rs       |  1 +
 crates/nu-parser/src/parser.rs                | 25 ++++++++++++++++---
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 crates/nu-command/tests/commands/export_def.rs

diff --git a/crates/nu-command/tests/commands/export_def.rs b/crates/nu-command/tests/commands/export_def.rs
new file mode 100644
index 0000000000..e4cfca21ed
--- /dev/null
+++ b/crates/nu-command/tests/commands/export_def.rs
@@ -0,0 +1,15 @@
+use nu_test_support::{nu, pipeline};
+
+#[test]
+fn export_subcommands_help() {
+    let actual = nu!(
+        cwd: ".", pipeline(
+        r#"
+        export def -h
+        "#
+    ));
+
+    assert!(actual
+        .out
+        .contains("Define a custom command and export it from a module"));
+}
diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs
index 5977e35efe..59f309ff4c 100644
--- a/crates/nu-command/tests/commands/mod.rs
+++ b/crates/nu-command/tests/commands/mod.rs
@@ -17,6 +17,7 @@ mod empty;
 mod enter;
 mod error_make;
 mod every;
+mod export_def;
 mod find;
 mod first;
 mod flatten;
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 3251da57a3..73e532bbdd 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -4794,11 +4794,30 @@ pub fn parse_builtin_commands(
         b"overlay" => parse_overlay(working_set, &lite_command.parts, expand_aliases_denylist),
         b"source" => parse_source(working_set, &lite_command.parts, expand_aliases_denylist),
         b"export" => {
-            if let Some(decl_id) = working_set.find_decl(b"export", &Type::Any) {
+            let full_decl = if lite_command.parts.len() > 1 {
+                let sub = working_set.get_span_contents(lite_command.parts[1]);
+                match sub {
+                    b"alias" | b"def" | b"def-env" | b"env" | b"extern" | b"use" => {
+                        [b"export ", sub].concat()
+                    }
+                    _ => b"export".to_vec(),
+                }
+            } else {
+                b"export".to_vec()
+            };
+            if let Some(decl_id) = working_set.find_decl(&full_decl, &Type::Any) {
                 let parsed_call = parse_internal_call(
                     working_set,
-                    lite_command.parts[0],
-                    &lite_command.parts[1..],
+                    if full_decl == b"export" {
+                        lite_command.parts[0]
+                    } else {
+                        span(&lite_command.parts[0..2])
+                    },
+                    if full_decl == b"export" {
+                        &lite_command.parts[1..]
+                    } else {
+                        &lite_command.parts[2..]
+                    },
                     decl_id,
                     expand_aliases_denylist,
                 );