Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of dead internal config of help logic:x

Browse Source
This commit is contained in:
sholderbach 2024-08-03 12:35:41 +02:00
parent 07e7c8c81f
commit 1b8396829d
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/nu-engine/src/documentation.rs
View File

@ -14,13 +14,6 @@ pub fn get_full_help(
engine_state: &EngineState, engine_state: &EngineState,
stack: &mut Stack, stack: &mut Stack,
) -> String { ) -> String {
let config = stack.get_config(engine_state);
let doc_config = DocumentationConfig {
no_subcommands: false,
no_color: !config.use_ansi_coloring,
brief: false,
};
let stack = &mut stack.start_capture(); let stack = &mut stack.start_capture();
let signature = command.signature().update_from_command(command); let signature = command.signature().update_from_command(command);
@ -29,18 +22,10 @@ pub fn get_full_help(
&command.examples(), &command.examples(),
engine_state, engine_state,
stack, stack,
&doc_config,
command.is_keyword(), command.is_keyword(),
) )
} }
#[derive(Default)]
struct DocumentationConfig {
no_subcommands: bool,
no_color: bool,
brief: bool,
}
// Utility returns nu-highlighted string // Utility returns nu-highlighted string
fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mut Stack) -> String { fn nu_highlight_string(code_string: &str, engine_state: &EngineState, stack: &mut Stack) -> String {
if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) { if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
@ -68,7 +53,6 @@ fn get_documentation(
examples: &[Example], examples: &[Example],
engine_state: &EngineState, engine_state: &EngineState,
stack: &mut Stack, stack: &mut Stack,
config: &DocumentationConfig,
is_parser_keyword: bool, is_parser_keyword: bool,
) -> String { ) -> String {
let nu_config = stack.get_config(engine_state); let nu_config = stack.get_config(engine_state);
@ -107,25 +91,23 @@ fn get_documentation(
long_desc.push_str("\n\n"); long_desc.push_str("\n\n");
} }
let extra_usage = if config.brief { "" } else { &sig.extra_usage }; let extra_usage = &sig.extra_usage;
if !extra_usage.is_empty() { if !extra_usage.is_empty() {
long_desc.push_str(extra_usage); long_desc.push_str(extra_usage);
long_desc.push_str("\n\n"); long_desc.push_str("\n\n");
} }
let mut subcommands = vec![]; let mut subcommands = vec![];
if !config.no_subcommands { let signatures = engine_state.get_signatures(true);
let signatures = engine_state.get_signatures(true); for sig in signatures {
for sig in signatures { // Don't display removed/deprecated commands in the Subcommands list
if sig.name.starts_with(&format!("{cmd_name} ")) if sig.name.starts_with(&format!("{cmd_name} "))
// Don't display removed/deprecated commands in the Subcommands list && !matches!(sig.category, Category::Removed)
&& !matches!(sig.category, Category::Removed) {
{ subcommands.push(format!(
subcommands.push(format!( " {help_subcolor_one}{}{RESET} - {}",
" {help_subcolor_one}{}{RESET} - {}", sig.name, sig.usage
sig.name, sig.usage ));
));
}
} }
} }
@ -300,7 +282,7 @@ fn get_documentation(
long_desc.push_str(" "); long_desc.push_str(" ");
long_desc.push_str(example.description); long_desc.push_str(example.description);
if config.no_color { if !nu_config.use_ansi_coloring {
let _ = write!(long_desc, "\n > {}\n", example.example); let _ = write!(long_desc, "\n > {}\n", example.example);
} else if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) { } else if let Some(highlighter) = engine_state.find_decl(b"nu-highlight", &[]) {
let decl = engine_state.get_decl(highlighter); let decl = engine_state.get_decl(highlighter);
@ -395,7 +377,7 @@ fn get_documentation(
long_desc.push('\n'); long_desc.push('\n');
if config.no_color { if !nu_config.use_ansi_coloring {
nu_utils::strip_ansi_string_likely(long_desc) nu_utils::strip_ansi_string_likely(long_desc)
} else { } else {
long_desc long_desc