mirror of
https://github.com/nushell/nushell.git
synced 2025-07-31 12:56:02 +02:00
# Description Adds formatting for code in backticks in `help` output. If it's possible to highlight syntax (`nu-highlight` is available and there's no invalid syntax) then it's highlighted. If the syntax is invalid or not an internal command, then it's dimmed and italicized. like some of the output from `std/help`. If `use_ansi_coloring` is `false`, then we leave the backticks alone. Here's a couple examples:   (note on this one: usually we can highlight partial commands, like `get` in the `select` help page which is invalid according to `nu-check` but is still properly highlighted, however `where` is special cased and just typing `where` with no row condition is highlighted with the garbage style so `where` alone isn't highlighted here)  here's the `where` page with `$env.config.use_ansi_coloring = false`:  Technically, some syntax is valid but isn't really "Nushell code". For example, the `select` help page has a line that says "Select just the \`name\` column". If you just type `name` in the REPL, Nushell treats it as an external command, but for the purposes of highlighted we actually want this to fall back to the generic dimmed/italic style. This is accomplished by temporarily setting the `shape_external` and `shape_externalarg` color config to the generic/fallback style, and then restoring the color config after highlighting. This is a bit hack-ish but it seems to work pretty well. # User-Facing Changes - `help` command now supports code backtick formatting. Code will be highlighted using `nu-highlight` if possible, otherwise it will fall back to a generic format. - Adds `--reject-garbage` flag to `nu-highlight` which will return an error on invalid syntax (which would otherwise be highlighted with `$env.config.color_config.shape_garbage`) # Tests + Formatting Added tests for the regex. I don't think tests for the actual highlighting are very necessary since the failure mode is graceful and it would be difficult to meaningfully test. # After Submitting N/A --------- Co-authored-by: Piepmatz <git+github@cptpiepmatz.de>
98 lines
2.9 KiB
Rust
98 lines
2.9 KiB
Rust
use std::sync::Arc;
|
|
|
|
use nu_engine::command_prelude::*;
|
|
use reedline::{Highlighter, StyledText};
|
|
|
|
use crate::syntax_highlight::highlight_syntax;
|
|
|
|
#[derive(Clone)]
|
|
pub struct NuHighlight;
|
|
|
|
impl Command for NuHighlight {
|
|
fn name(&self) -> &str {
|
|
"nu-highlight"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("nu-highlight")
|
|
.category(Category::Strings)
|
|
.switch(
|
|
"reject-garbage",
|
|
"Return an error if invalid syntax (garbage) was encountered",
|
|
Some('r'),
|
|
)
|
|
.input_output_types(vec![(Type::String, Type::String)])
|
|
}
|
|
|
|
fn description(&self) -> &str {
|
|
"Syntax highlight the input string."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["syntax", "color", "convert"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let reject_garbage = call.has_flag(engine_state, stack, "reject-garbage")?;
|
|
let head = call.head;
|
|
|
|
let signals = engine_state.signals();
|
|
|
|
let engine_state = Arc::new(engine_state.clone());
|
|
let stack = Arc::new(stack.clone());
|
|
|
|
input.map(
|
|
move |x| match x.coerce_into_string() {
|
|
Ok(line) => {
|
|
let result = highlight_syntax(&engine_state, &stack, &line, line.len());
|
|
|
|
let highlights = match (reject_garbage, result.found_garbage) {
|
|
(false, _) => result.text,
|
|
(true, None) => result.text,
|
|
(true, Some(span)) => {
|
|
let error = ShellError::OutsideSpannedLabeledError {
|
|
src: line,
|
|
error: "encountered invalid syntax while highlighting".into(),
|
|
msg: "invalid syntax".into(),
|
|
span,
|
|
};
|
|
return Value::error(error, head);
|
|
}
|
|
};
|
|
|
|
Value::string(highlights.render_simple(), head)
|
|
}
|
|
Err(err) => Value::error(err, head),
|
|
},
|
|
signals,
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Describe the type of a string",
|
|
example: "'let x = 3' | nu-highlight",
|
|
result: None,
|
|
}]
|
|
}
|
|
}
|
|
|
|
/// A highlighter that does nothing
|
|
///
|
|
/// Used to remove highlighting from a reedline instance
|
|
/// (letting NuHighlighter structs be dropped)
|
|
#[derive(Default)]
|
|
pub struct NoOpHighlighter {}
|
|
|
|
impl Highlighter for NoOpHighlighter {
|
|
fn highlight(&self, _line: &str, _cursor: usize) -> reedline::StyledText {
|
|
StyledText::new()
|
|
}
|
|
}
|