nushell/crates/nu-engine/src/documentation.rs

316 lines
10 KiB
Rust
Raw Normal View History

use nu_protocol::{
ast::Call,
engine::{EngineState, Stack},
Example, IntoPipelineData, 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,
)
}
2021-12-02 19:05:38 +01:00
#[derive(Default)]
struct DocumentationConfig {
no_subcommands: bool,
2021-02-22 19:33:34 +01:00
no_color: bool,
brief: bool,
}
#[allow(clippy::cognitive_complexity)]
fn get_documentation(
2021-10-09 03:02:01 +02:00
sig: &Signature,
examples: &[Example],
2021-10-25 08:31:39 +02:00
engine_state: &EngineState,
stack: &mut Stack,
2021-10-09 03:02:01 +02:00
config: &DocumentationConfig,
is_parser_keyword: bool,
2021-10-09 03:02:01 +02:00
) -> 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
2021-10-09 03:02:01 +02:00
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");
}
2021-10-09 03:02:01 +02:00
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);
2021-10-09 03:02:01 +02:00
for sig in signatures {
Do not list deprecated subcommands in `help <cmd>` (#7798) # Description BEFORE: ``` Subcommands: str camel-case - Convert a string to camelCase str capitalize - Capitalize first letter of text str collect - 'str collect' is deprecated. Please use 'str join' instead. str contains - Checks if string input contains a substring str distance - Compare two strings and return the edit distance/Levenshtein distance str downcase - Make text lowercase str ends-with - Check if an input ends with a string str find-replace - Deprecated command str index-of - Returns start index of first occurrence of string in input, or -1 if no match str join - Concatenate multiple strings into a single string, with an optional separator between each str kebab-case - Convert a string to kebab-case str length - Output the length of any strings in the pipeline str lpad - Left-pad a string to a specific length str pascal-case - Convert a string to PascalCase str replace - Find and replace text str reverse - Reverse every string in the pipeline str rpad - Right-pad a string to a specific length str screaming-snake-case - Convert a string to SCREAMING_SNAKE_CASE str snake-case - Convert a string to snake_case str starts-with - Check if an input starts with a string str substring - Get part of a string. Note that the start is included but the end is excluded, and that the first character of a string is index 0. str title-case - Convert a string to Title Case str to-datetime - Deprecated command str to-decimal - Deprecated command str to-int - Deprecated command str trim - Trim whitespace or specific character str upcase - Make text uppercase ``` AFTER: ``` Subcommands: str camel-case - Convert a string to camelCase str capitalize - Capitalize first letter of text str contains - Checks if string input contains a substring str distance - Compare two strings and return the edit distance/Levenshtein distance str downcase - Make text lowercase str ends-with - Check if an input ends with a string str index-of - Returns start index of first occurrence of string in input, or -1 if no match str join - Concatenate multiple strings into a single string, with an optional separator between each str kebab-case - Convert a string to kebab-case str length - Output the length of any strings in the pipeline str lpad - Left-pad a string to a specific length str pascal-case - Convert a string to PascalCase str replace - Find and replace text str reverse - Reverse every string in the pipeline str rpad - Right-pad a string to a specific length str screaming-snake-case - Convert a string to SCREAMING_SNAKE_CASE str snake-case - Convert a string to snake_case str starts-with - Check if an input starts with a string str substring - Get part of a string. Note that the start is included but the end is excluded, and that the first character of a string is index 0. str title-case - Convert a string to Title Case str trim - Trim whitespace or specific character str upcase - Make text uppercase ``` The deprecated subcommands still exist, but are no longer listed in `help` for the containing command. # User-Facing Changes See above. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
2023-01-20 13:28:27 +01:00
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() {
Apply clippy fix for rust 1.63.0 (#6576) * Apply clippy fix to avoid extra allocation error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:82:9 | 82 | long_desc.push_str(&format!("\n{G}Subcommands{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D clippy::format-push-string` implied by `-D warnings` = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:96:9 | 96 | long_desc.push_str(&format!("\n{G}Parameters{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:128:9 | 128 | long_desc.push_str(&format!("\n{}Examples{}:", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:202:5 | 202 | long_desc.push_str(&format!("\n{}Flags{}:\n", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: could not compile `nu-engine` due to 4 previous errors * Apply clippy fix to avoid deref on an immutable reference error: deref on an immutable reference --> crates/nu-command/src/dataframe/eager/sql_context.rs:188:77 | 188 | SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?, | ^^^^^^^^^^^^^ | = note: `-D clippy::borrow-deref-ref` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref help: if you would like to reborrow, try removing `&*` | 188 | SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?, | ~~~~~~~~~~~ help: if you would like to deref, try using `&**` | 188 | SetExpr::Select(select_stmt) => self.execute_select(&**select_stmt)?, | ~~~~~~~~~~~~~~ error: deref on an immutable reference --> crates/nu-command/src/database/values/dsl/expression.rs:252:15 | 252 | match &*expr { | ^^^^^^ help: if you would like to reborrow, try removing `&*`: `expr` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref error: could not compile `nu-command` due to 2 previous errors
2022-09-17 19:10:32 +02:00
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{}Signatures(Cell paths are supported){}:\n{}",
G, RESET, sig
);
} else {
let _ = writeln!(long_desc, "\n{}Signatures{}:\n{}", G, RESET, sig);
}
}
2021-10-09 03:02:01 +02:00
if !sig.required_positional.is_empty()
|| !sig.optional_positional.is_empty()
|| sig.rest_positional.is_some()
{
Apply clippy fix for rust 1.63.0 (#6576) * Apply clippy fix to avoid extra allocation error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:82:9 | 82 | long_desc.push_str(&format!("\n{G}Subcommands{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D clippy::format-push-string` implied by `-D warnings` = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:96:9 | 96 | long_desc.push_str(&format!("\n{G}Parameters{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:128:9 | 128 | long_desc.push_str(&format!("\n{}Examples{}:", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:202:5 | 202 | long_desc.push_str(&format!("\n{}Flags{}:\n", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: could not compile `nu-engine` due to 4 previous errors * Apply clippy fix to avoid deref on an immutable reference error: deref on an immutable reference --> crates/nu-command/src/dataframe/eager/sql_context.rs:188:77 | 188 | SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?, | ^^^^^^^^^^^^^ | = note: `-D clippy::borrow-deref-ref` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref help: if you would like to reborrow, try removing `&*` | 188 | SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?, | ~~~~~~~~~~~ help: if you would like to deref, try using `&**` | 188 | SetExpr::Select(select_stmt) => self.execute_select(&**select_stmt)?, | ~~~~~~~~~~~~~~ error: deref on an immutable reference --> crates/nu-command/src/database/values/dsl/expression.rs:252:15 | 252 | match &*expr { | ^^^^^^ help: if you would like to reborrow, try removing `&*`: `expr` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref error: could not compile `nu-command` due to 2 previous errors
2022-09-17 19:10:32 +02:00
let _ = write!(long_desc, "\n{G}Parameters{RESET}:\n");
2021-10-09 03:02:01 +02:00
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);
2021-10-09 03:02:01 +02:00
}
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);
2021-10-09 03:02:01 +02:00
}
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);
2021-10-09 03:02:01 +02:00
}
}
if !examples.is_empty() {
Apply clippy fix for rust 1.63.0 (#6576) * Apply clippy fix to avoid extra allocation error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:82:9 | 82 | long_desc.push_str(&format!("\n{G}Subcommands{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D clippy::format-push-string` implied by `-D warnings` = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:96:9 | 96 | long_desc.push_str(&format!("\n{G}Parameters{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:128:9 | 128 | long_desc.push_str(&format!("\n{}Examples{}:", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:202:5 | 202 | long_desc.push_str(&format!("\n{}Flags{}:\n", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: could not compile `nu-engine` due to 4 previous errors * Apply clippy fix to avoid deref on an immutable reference error: deref on an immutable reference --> crates/nu-command/src/dataframe/eager/sql_context.rs:188:77 | 188 | SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?, | ^^^^^^^^^^^^^ | = note: `-D clippy::borrow-deref-ref` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref help: if you would like to reborrow, try removing `&*` | 188 | SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?, | ~~~~~~~~~~~ help: if you would like to deref, try using `&**` | 188 | SetExpr::Select(select_stmt) => self.execute_select(&**select_stmt)?, | ~~~~~~~~~~~~~~ error: deref on an immutable reference --> crates/nu-command/src/database/values/dsl/expression.rs:252:15 | 252 | match &*expr { | ^^^^^^ help: if you would like to reborrow, try removing `&*`: `expr` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref error: could not compile `nu-command` due to 2 previous errors
2022-09-17 19:10:32 +02:00
let _ = write!(long_desc, "\n{}Examples{}:", G, RESET);
2021-10-09 03:02:01 +02:00
}
for example in examples {
long_desc.push('\n');
long_desc.push_str(" ");
long_desc.push_str(example.description);
2021-02-22 19:33:34 +01:00
if config.no_color {
let _ = write!(long_desc, "\n > {}\n", example.example);
Overlays (#5375) * WIP: Start laying overlays * Rename Overlay->Module; Start adding overlay * Revamp adding overlay * Add overlay add tests; Disable debug print * Fix overlay add; Add overlay remove * Add overlay remove tests * Add missing overlay remove file * Add overlay list command * (WIP?) Enable overlays for env vars * Move OverlayFrames to ScopeFrames * (WIP) Move everything to overlays only ScopeFrame contains nothing but overlays now * Fix predecls * Fix wrong overlay id translation and aliases * Fix broken env lookup logic * Remove TODOs * Add overlay add + remove for environment * Add a few overlay tests; Fix overlay add name * Some cleanup; Fix overlay add/remove names * Clippy * Fmt * Remove walls of comments * List overlays from stack; Add debugging flag Currently, the engine state ordering is somehow broken. * Fix (?) overlay list test * Fix tests on Windows * Fix activated overlay ordering * Check for active overlays equality in overlay list This removes the -p flag: Either both parser and engine will have the same overlays, or the command will fail. * Add merging on overlay remove * Change help message and comment * Add some remove-merge/discard tests * (WIP) Track removed overlays properly * Clippy; Fmt * Fix getting last overlay; Fix predecls in overlays * Remove merging; Fix re-add overwriting stuff Also some error message tweaks. * Fix overlay error in the engine * Update variable_completions.rs * Adds flags and optional arguments to view-source (#5446) * added flags and optional arguments to view-source * removed redundant code * removed redundant code * fmt * fix bug in shell_integration (#5450) * fix bug in shell_integration * add some comments * enable cd to work with directory abbreviations (#5452) * enable cd to work with abbreviations * add abbreviation example * fix tests * make it configurable * make cd recornize symblic link (#5454) * implement seq char command to generate single character sequence (#5453) * add tmp code * add seq char command * Add split number flag in `split row` (#5434) Signed-off-by: Yuheng Su <gipsyh.icu@gmail.com> * Add two more overlay tests * Add ModuleId to OverlayFrame * Fix env conversion accidentally activating overlay It activated overlay from permanent state prematurely which would cause `overlay add` to misbehave. * Remove unused parameter; Add overlay list test * Remove added traces * Add overlay commands examples * Modify TODO * Fix $nu.scope iteration * Disallow removing default overlay * Refactor some parser errors * Remove last overlay if no argument * Diversify overlay examples * Make it possible to update overlay's module In case the origin module updates, the overlay add loads the new module, makes it overlay's origin and applies the changes. Before, it was impossible to update the overlay if the module changed. Co-authored-by: JT <547158+jntrnr@users.noreply.github.com> Co-authored-by: pwygab <88221256+merelymyself@users.noreply.github.com> Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com> Co-authored-by: WindSoilder <WindSoilder@outlook.com> Co-authored-by: Yuheng Su <gipsyh.icu@gmail.com>
2022-05-07 21:39:22 +02:00
} else if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
let decl = engine_state.get_decl(highlighter);
2021-10-09 03:02:01 +02:00
match decl.run(
engine_state,
stack,
Protocol: debug_assert!() Span to reflect a valid slice (#6806) Also enforce this by #[non_exhaustive] span such that going forward we cannot, in debug builds (1), construct invalid spans. The motivation for this stems from #6431 where I've seen crashes due to invalid slice indexing. My hope is this will mitigate such senarios 1. https://github.com/nushell/nushell/pull/6431#issuecomment-1278147241 # Description (description of your pull request here) # Tests Make sure you've done the following: - [ ] Add tests that cover your changes, either in the command examples, the crate/tests folder, or in the /tests folder. - [ ] Try to think about corner cases and various ways how your changes could break. Cover them with tests. - [ ] If adding tests is not possible, please document in the PR body a minimal example with steps on how to reproduce so one can verify your change works. Make sure you've run and fixed any issues with these commands: - [x] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - [ ] `cargo clippy --workspace --features=extra -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - [ ] `cargo test --workspace --features=extra` to check that all the tests pass # Documentation - [ ] If your PR touches a user-facing nushell feature then make sure that there is an entry in the documentation (https://github.com/nushell/nushell.github.io) for the feature, and update it if necessary.
2022-12-03 10:44:12 +01:00
&Call::new(Span::unknown()),
Reduced LOC by replacing several instances of `Value::Int {}`, `Value::Float{}`, `Value::Bool {}`, and `Value::String {}` with `Value::int()`, `Value::float()`, `Value::boolean()` and `Value::string()` (#7412) # Description While perusing Value.rs, I noticed the `Value::int()`, `Value::float()`, `Value::boolean()` and `Value::string()` constructors, which seem designed to make it easier to construct various Values, but which aren't used often at all in the codebase. So, using a few find-replaces regexes, I increased their usage. This reduces overall LOC because structures like this: ``` Value::Int { val: a, span: head } ``` are changed into ``` Value::int(a, head) ``` and are respected as such by the project's formatter. There are little readability concerns because the second argument to all of these is `span`, and it's almost always extremely obvious which is the span at every callsite. # User-Facing Changes None. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-09 17:37:51 +01:00
Value::string(example.example, Span::unknown()).into_pipeline_data(),
) {
Ok(output) => {
Protocol: debug_assert!() Span to reflect a valid slice (#6806) Also enforce this by #[non_exhaustive] span such that going forward we cannot, in debug builds (1), construct invalid spans. The motivation for this stems from #6431 where I've seen crashes due to invalid slice indexing. My hope is this will mitigate such senarios 1. https://github.com/nushell/nushell/pull/6431#issuecomment-1278147241 # Description (description of your pull request here) # Tests Make sure you've done the following: - [ ] Add tests that cover your changes, either in the command examples, the crate/tests folder, or in the /tests folder. - [ ] Try to think about corner cases and various ways how your changes could break. Cover them with tests. - [ ] If adding tests is not possible, please document in the PR body a minimal example with steps on how to reproduce so one can verify your change works. Make sure you've run and fixed any issues with these commands: - [x] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - [ ] `cargo clippy --workspace --features=extra -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - [ ] `cargo test --workspace --features=extra` to check that all the tests pass # Documentation - [ ] If your PR touches a user-facing nushell feature then make sure that there is an entry in the documentation (https://github.com/nushell/nushell.github.io) for the feature, and update it if necessary.
2022-12-03 10:44:12 +01:00
let result = output.into_value(Span::unknown());
match result.as_string() {
Ok(s) => {
let _ = write!(long_desc, "\n > {}\n", s);
}
_ => {
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);
}
}
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
2021-10-09 03:02:01 +02:00
let mut long_desc = String::new();
Apply clippy fix for rust 1.63.0 (#6576) * Apply clippy fix to avoid extra allocation error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:82:9 | 82 | long_desc.push_str(&format!("\n{G}Subcommands{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D clippy::format-push-string` implied by `-D warnings` = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:96:9 | 96 | long_desc.push_str(&format!("\n{G}Parameters{RESET}:\n")); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:128:9 | 128 | long_desc.push_str(&format!("\n{}Examples{}:", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: `format!(..)` appended to existing `String` --> crates/nu-engine/src/documentation.rs:202:5 | 202 | long_desc.push_str(&format!("\n{}Flags{}:\n", G, RESET)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: consider using `write!` to avoid the extra allocation = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string error: could not compile `nu-engine` due to 4 previous errors * Apply clippy fix to avoid deref on an immutable reference error: deref on an immutable reference --> crates/nu-command/src/dataframe/eager/sql_context.rs:188:77 | 188 | SetExpr::Select(select_stmt) => self.execute_select(&*select_stmt)?, | ^^^^^^^^^^^^^ | = note: `-D clippy::borrow-deref-ref` implied by `-D warnings` = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref help: if you would like to reborrow, try removing `&*` | 188 | SetExpr::Select(select_stmt) => self.execute_select(select_stmt)?, | ~~~~~~~~~~~ help: if you would like to deref, try using `&**` | 188 | SetExpr::Select(select_stmt) => self.execute_select(&**select_stmt)?, | ~~~~~~~~~~~~~~ error: deref on an immutable reference --> crates/nu-command/src/database/values/dsl/expression.rs:252:15 | 252 | match &*expr { | ^^^^^^ help: if you would like to reborrow, try removing `&*`: `expr` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#borrow_deref_ref error: could not compile `nu-command` due to 2 previous errors
2022-09-17 19:10:32 +02:00
let _ = write!(long_desc, "\n{}Flags{}:\n", G, RESET);
2021-10-09 03:02:01 +02:00
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",
2021-10-13 19:58:39 +02:00
short,
if !flag.long.is_empty() {
format!("{D},{RESET} {C}--{}", flag.long)
2021-10-13 19:58:39 +02:00
} else {
"".into()
},
arg,
flag.desc
2021-10-09 03:02:01 +02:00
)
} else {
2021-10-13 19:58:39 +02:00
format!(
" {C}-{}{}{RESET} <{BB}{:?}{RESET}> - {}\n",
2021-10-13 19:58:39 +02:00
short,
if !flag.long.is_empty() {
format!("{D},{RESET} {C}--{}", flag.long)
2021-10-13 19:58:39 +02:00
} else {
"".into()
},
arg,
flag.desc
)
2021-10-09 03:02:01 +02:00
}
} else if flag.required {
format!(
" {C}--{}{RESET} (required parameter) <{BB}{:?}{RESET}> - {}\n",
2021-10-09 03:02:01 +02:00
flag.long, arg, flag.desc
)
} else {
format!(
" {C}--{}{RESET} <{BB}{:?}{RESET}> - {}\n",
flag.long, arg, flag.desc
)
2021-10-09 03:02:01 +02:00
}
} else if let Some(short) = flag.short {
if flag.required {
format!(
" {C}-{}{}{RESET} (required parameter) - {}\n",
2021-10-13 19:58:39 +02:00
short,
if !flag.long.is_empty() {
format!("{D},{RESET} {C}--{}", flag.long)
2021-10-13 19:58:39 +02:00
} else {
"".into()
},
flag.desc
2021-10-09 03:02:01 +02:00
)
} else {
2021-10-13 19:58:39 +02:00
format!(
" {C}-{}{}{RESET} - {}\n",
2021-10-13 19:58:39 +02:00
short,
if !flag.long.is_empty() {
format!("{D},{RESET} {C}--{}", flag.long)
2021-10-13 19:58:39 +02:00
} else {
"".into()
},
flag.desc
)
2021-10-09 03:02:01 +02:00
}
} else if flag.required {
format!(
" {C}--{}{RESET} (required parameter) - {}\n",
flag.long, flag.desc
)
2021-10-09 03:02:01 +02:00
} else {
format!(" {C}--{}{RESET} - {}\n", flag.long, flag.desc)
};
long_desc.push_str(&msg);
}
long_desc
}