Should close #8035. > **Note** > this is my first technical PR for `nushell` > - i might very well miss things > - i tried to be as complete as possible about the changes > - please require further changes if i did something wrong, i'm open to any remark 😌 # Description this PR adds, when it is defined in the `examples` method of the `Command` implementations, the output of the examples to the output of the `help` command. this PR - only modifies `crates/nu-engine/src/documentation.rs` and the `get_documentation` function - defines a new `WD` constant to print a **W**hite **D**immed `...` - a `match` statement at the end of the example loop to - print a white dimmed `...` when the example is not set, i.e. set to `None` in the `examples` method of the `Command` implementation of a command - pretty print the output of the associated example `Value` when it has been defined > **Warning** > LIMITATIONS: > - i use snippets from `crates/nu-protocol/src/pipeline_data.rs` > - the table creation from `pub PipelineData::print`, i.e. the `let decl_id = ...;` and `let table = ...;` in the change > - the table item printing from `PipelineData::write_all_and_flush`, i.e. the `for item in table { ... }` > > ADDRESSED: > - ~~the formatting of the output is not perfect and has to be fully left aligned with the first column for now~~ (fixed with [`5abeefd558c34ba9bae15e2f183ff4625442921e`..`a62be1b5a2c730959da5dbc028bb91ffe5093f63`](5abeefd558c34ba9bae15e2f183ff4625442921e..a62be1b5a2c730959da5dbc028bb91ffe5093f63)) > - ~~i'm using `.unwrap()` on both the changes above, not sure how to handle this for now~~ (fixed for now thanks to49f1dc080
) > - ~~the tests and `clippy` checks do not pass for now, see below~~ (`clippy` now is happy with49f1dc080
and the tests pass with11666bc715
) # User-Facing Changes the output of the `help <command>` command is now augmented with the outputs of the examples, when they are defined. - `with-env` ```bash > help with-env ... Examples: Set the MYENV environment variable > with-env [MYENV "my env value"] { $env.MYENV } my env value Set by primitive value list > with-env [X Y W Z] { $env.X } Y Set by single row table > with-env [[X W]; [Y Z]] { $env.W } Z Set by key-value record > with-env {X: "Y", W: "Z"} { [$env.X $env.W] } ╭───┬───╮ │ 0 │ Y │ │ 1 │ Z │ ╰───┴───╯ ``` instead of the previous ```bash > help with-env ... Examples: Set the MYENV environment variable > with-env [MYENV "my env value"] { $env.MYENV } Set by primitive value list > with-env [X Y W Z] { $env.X } Set by single row table > with-env [[X W]; [Y Z]] { $env.W } Set by key-value record > with-env {X: "Y", W: "Z"} { [$env.X $env.W] } ``` - `merge` ```bash > help merge ... Examples: Add an 'index' column to the input table > [a b c] | wrap name | merge ( [1 2 3] | wrap index ) ╭───┬──────╮ │ # │ name │ ├───┼──────┤ │ 1 │ a │ │ 2 │ b │ │ 3 │ c │ ╰───┴──────╯ Merge two records > {a: 1, b: 2} | merge {c: 3} ╭───┬───╮ │ a │ 1 │ │ b │ 2 │ │ c │ 3 │ ╰───┴───╯ Merge two tables, overwriting overlapping columns > [{columnA: A0 columnB: B0}] | merge [{columnA: 'A0*'}] ╭───┬─────────┬─────────╮ │ # │ columnA │ columnB │ ├───┼─────────┼─────────┤ │ 0 │ A0* │ B0 │ ╰───┴─────────┴─────────╯ ``` instead of the previous ```bash > help merge ... Examples: Add an 'index' column to the input table > [a b c] | wrap name | merge ( [1 2 3] | wrap index ) Merge two records > {a: 1, b: 2} | merge {c: 3} Merge two tables, overwriting overlapping columns > [{columnA: A0 columnB: B0}] | merge [{columnA: 'A0*'}] ```
341 lines
11 KiB
Rust
341 lines
11 KiB
Rust
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{EngineState, Stack},
|
|
Example, IntoPipelineData, PipelineData, Signature, Span, SyntaxShape, Value,
|
|
};
|
|
use std::fmt::Write;
|
|
|
|
pub fn get_full_help(
|
|
sig: &Signature,
|
|
examples: &[Example],
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
is_parser_keyword: bool,
|
|
) -> String {
|
|
let config = engine_state.get_config();
|
|
let doc_config = DocumentationConfig {
|
|
no_subcommands: false,
|
|
no_color: !config.use_ansi_coloring,
|
|
brief: false,
|
|
};
|
|
get_documentation(
|
|
sig,
|
|
examples,
|
|
engine_state,
|
|
stack,
|
|
&doc_config,
|
|
is_parser_keyword,
|
|
)
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct DocumentationConfig {
|
|
no_subcommands: bool,
|
|
no_color: bool,
|
|
brief: bool,
|
|
}
|
|
|
|
#[allow(clippy::cognitive_complexity)]
|
|
fn get_documentation(
|
|
sig: &Signature,
|
|
examples: &[Example],
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
config: &DocumentationConfig,
|
|
is_parser_keyword: bool,
|
|
) -> String {
|
|
// Create ansi colors
|
|
const G: &str = "\x1b[32m"; // green
|
|
const C: &str = "\x1b[36m"; // cyan
|
|
const BB: &str = "\x1b[1;34m"; // bold blue
|
|
const RESET: &str = "\x1b[0m"; // reset
|
|
|
|
let cmd_name = &sig.name;
|
|
let mut long_desc = String::new();
|
|
|
|
let usage = &sig.usage;
|
|
if !usage.is_empty() {
|
|
long_desc.push_str(usage);
|
|
long_desc.push_str("\n\n");
|
|
}
|
|
|
|
let extra_usage = if config.brief { "" } else { &sig.extra_usage };
|
|
if !extra_usage.is_empty() {
|
|
long_desc.push_str(extra_usage);
|
|
long_desc.push_str("\n\n");
|
|
}
|
|
|
|
let mut subcommands = vec![];
|
|
if !config.no_subcommands {
|
|
let signatures = engine_state.get_signatures(true);
|
|
for sig in signatures {
|
|
if sig.name.starts_with(&format!("{cmd_name} "))
|
|
// Don't display deprecated commands in the Subcommands list
|
|
&& !sig.usage.starts_with("Deprecated command")
|
|
{
|
|
subcommands.push(format!(" {C}{}{RESET} - {}", sig.name, sig.usage));
|
|
}
|
|
}
|
|
}
|
|
|
|
if !sig.search_terms.is_empty() {
|
|
let text = format!(
|
|
"{G}Search terms{RESET}: {C}{}{}\n\n",
|
|
sig.search_terms.join(", "),
|
|
RESET
|
|
);
|
|
let _ = write!(long_desc, "{text}");
|
|
}
|
|
|
|
let text = format!("{}Usage{}:\n > {}\n", G, RESET, sig.call_signature());
|
|
let _ = write!(long_desc, "{text}");
|
|
|
|
if !subcommands.is_empty() {
|
|
let _ = write!(long_desc, "\n{G}Subcommands{RESET}:\n");
|
|
subcommands.sort();
|
|
long_desc.push_str(&subcommands.join("\n"));
|
|
long_desc.push('\n');
|
|
}
|
|
|
|
if !sig.named.is_empty() {
|
|
long_desc.push_str(&get_flags_section(sig))
|
|
}
|
|
|
|
if !is_parser_keyword && !sig.input_output_types.is_empty() {
|
|
if sig.operates_on_cell_paths() {
|
|
let _ = writeln!(
|
|
long_desc,
|
|
"\n{G}Signatures(Cell paths are supported){RESET}:\n{sig}"
|
|
);
|
|
} else {
|
|
let _ = writeln!(long_desc, "\n{G}Signatures{RESET}:\n{sig}");
|
|
}
|
|
}
|
|
|
|
if !sig.required_positional.is_empty()
|
|
|| !sig.optional_positional.is_empty()
|
|
|| sig.rest_positional.is_some()
|
|
{
|
|
let _ = write!(long_desc, "\n{G}Parameters{RESET}:\n");
|
|
for positional in &sig.required_positional {
|
|
let text = match &positional.shape {
|
|
SyntaxShape::Keyword(kw, shape) => {
|
|
format!(
|
|
" {C}\"{}\" + {RESET}<{BB}{}{RESET}>: {}",
|
|
String::from_utf8_lossy(kw),
|
|
document_shape(*shape.clone()),
|
|
positional.desc
|
|
)
|
|
}
|
|
_ => {
|
|
format!(
|
|
" {C}{}{RESET} <{BB}{}{RESET}>: {}",
|
|
positional.name,
|
|
document_shape(positional.shape.clone()),
|
|
positional.desc
|
|
)
|
|
}
|
|
};
|
|
let _ = writeln!(long_desc, "{text}");
|
|
}
|
|
for positional in &sig.optional_positional {
|
|
let text = match &positional.shape {
|
|
SyntaxShape::Keyword(kw, shape) => {
|
|
format!(
|
|
" (optional) {C}\"{}\" + {RESET}<{BB}{}{RESET}>: {}",
|
|
String::from_utf8_lossy(kw),
|
|
document_shape(*shape.clone()),
|
|
positional.desc
|
|
)
|
|
}
|
|
_ => {
|
|
format!(
|
|
" (optional) {C}{}{RESET} <{BB}{}{RESET}>: {}",
|
|
positional.name,
|
|
document_shape(positional.shape.clone()),
|
|
positional.desc
|
|
)
|
|
}
|
|
};
|
|
let _ = writeln!(long_desc, "{text}");
|
|
}
|
|
|
|
if let Some(rest_positional) = &sig.rest_positional {
|
|
let text = format!(
|
|
" ...{C}{}{RESET} <{BB}{}{RESET}>: {}",
|
|
rest_positional.name,
|
|
document_shape(rest_positional.shape.clone()),
|
|
rest_positional.desc
|
|
);
|
|
let _ = writeln!(long_desc, "{text}");
|
|
}
|
|
}
|
|
|
|
if !examples.is_empty() {
|
|
let _ = write!(long_desc, "\n{G}Examples{RESET}:");
|
|
}
|
|
|
|
for example in examples {
|
|
long_desc.push('\n');
|
|
long_desc.push_str(" ");
|
|
long_desc.push_str(example.description);
|
|
|
|
if config.no_color {
|
|
let _ = write!(long_desc, "\n > {}\n", example.example);
|
|
} else if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
|
|
let decl = engine_state.get_decl(highlighter);
|
|
|
|
match decl.run(
|
|
engine_state,
|
|
stack,
|
|
&Call::new(Span::unknown()),
|
|
Value::string(example.example, Span::unknown()).into_pipeline_data(),
|
|
) {
|
|
Ok(output) => {
|
|
let result = output.into_value(Span::unknown());
|
|
match result.as_string() {
|
|
Ok(s) => {
|
|
let _ = write!(long_desc, "\n > {s}\n");
|
|
}
|
|
_ => {
|
|
let _ = write!(long_desc, "\n > {}\n", example.example);
|
|
}
|
|
}
|
|
}
|
|
Err(_) => {
|
|
let _ = write!(long_desc, "\n > {}\n", example.example);
|
|
}
|
|
}
|
|
} else {
|
|
let _ = write!(long_desc, "\n > {}\n", example.example);
|
|
}
|
|
|
|
if let Some(result) = &example.result {
|
|
let table = engine_state
|
|
.find_decl("table".as_bytes(), &[])
|
|
.and_then(|decl_id| {
|
|
engine_state
|
|
.get_decl(decl_id)
|
|
.run(
|
|
engine_state,
|
|
stack,
|
|
&Call::new(Span::new(0, 0)),
|
|
PipelineData::Value(result.clone(), None),
|
|
)
|
|
.ok()
|
|
});
|
|
|
|
for item in table.into_iter().flatten() {
|
|
let _ = writeln!(
|
|
long_desc,
|
|
" {}",
|
|
item.into_string("", engine_state.get_config())
|
|
.replace('\n', "\n ")
|
|
.trim()
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
long_desc.push('\n');
|
|
|
|
if config.no_color {
|
|
nu_utils::strip_ansi_string_likely(long_desc)
|
|
} else {
|
|
long_desc
|
|
}
|
|
}
|
|
|
|
// document shape helps showing more useful information
|
|
pub fn document_shape(shape: SyntaxShape) -> SyntaxShape {
|
|
match shape {
|
|
SyntaxShape::Custom(inner_shape, _) => *inner_shape,
|
|
_ => shape,
|
|
}
|
|
}
|
|
|
|
pub fn get_flags_section(signature: &Signature) -> String {
|
|
const G: &str = "\x1b[32m"; // green
|
|
const C: &str = "\x1b[36m"; // cyan
|
|
const BB: &str = "\x1b[1;34m"; // bold blue
|
|
const RESET: &str = "\x1b[0m"; // reset
|
|
const D: &str = "\x1b[39m"; // default
|
|
|
|
let mut long_desc = String::new();
|
|
let _ = write!(long_desc, "\n{G}Flags{RESET}:\n");
|
|
for flag in &signature.named {
|
|
let msg = if let Some(arg) = &flag.arg {
|
|
if let Some(short) = flag.short {
|
|
if flag.required {
|
|
format!(
|
|
" {C}-{}{}{RESET} (required parameter) {:?} - {}\n",
|
|
short,
|
|
if !flag.long.is_empty() {
|
|
format!("{D},{RESET} {C}--{}", flag.long)
|
|
} else {
|
|
"".into()
|
|
},
|
|
arg,
|
|
flag.desc
|
|
)
|
|
} else {
|
|
format!(
|
|
" {C}-{}{}{RESET} <{BB}{:?}{RESET}> - {}\n",
|
|
short,
|
|
if !flag.long.is_empty() {
|
|
format!("{D},{RESET} {C}--{}", flag.long)
|
|
} else {
|
|
"".into()
|
|
},
|
|
arg,
|
|
flag.desc
|
|
)
|
|
}
|
|
} else if flag.required {
|
|
format!(
|
|
" {C}--{}{RESET} (required parameter) <{BB}{:?}{RESET}> - {}\n",
|
|
flag.long, arg, flag.desc
|
|
)
|
|
} else {
|
|
format!(
|
|
" {C}--{}{RESET} <{BB}{:?}{RESET}> - {}\n",
|
|
flag.long, arg, flag.desc
|
|
)
|
|
}
|
|
} else if let Some(short) = flag.short {
|
|
if flag.required {
|
|
format!(
|
|
" {C}-{}{}{RESET} (required parameter) - {}\n",
|
|
short,
|
|
if !flag.long.is_empty() {
|
|
format!("{D},{RESET} {C}--{}", flag.long)
|
|
} else {
|
|
"".into()
|
|
},
|
|
flag.desc
|
|
)
|
|
} else {
|
|
format!(
|
|
" {C}-{}{}{RESET} - {}\n",
|
|
short,
|
|
if !flag.long.is_empty() {
|
|
format!("{D},{RESET} {C}--{}", flag.long)
|
|
} else {
|
|
"".into()
|
|
},
|
|
flag.desc
|
|
)
|
|
}
|
|
} else if flag.required {
|
|
format!(
|
|
" {C}--{}{RESET} (required parameter) - {}\n",
|
|
flag.long, flag.desc
|
|
)
|
|
} else {
|
|
format!(" {C}--{}{RESET} - {}\n", flag.long, flag.desc)
|
|
};
|
|
long_desc.push_str(&msg);
|
|
}
|
|
long_desc
|
|
}
|