mirror of
https://github.com/nushell/nushell.git
synced 2025-03-29 09:06:52 +01:00
a52386e837
# Description Our `ShellError` at the moment has a `std::mem::size_of<ShellError>` of 136 bytes (on AMD64). As a result `Value` directly storing the struct also required 136 bytes (thanks to alignment requirements). This change stores the `Value::Error` `ShellError` on the heap. Pro: - Value now needs just 80 bytes - Should be 1 cacheline less (still at least 2 cachelines) Con: - More small heap allocations when dealing with `Value::Error` - More heap fragmentation - Potential for additional required memcopies # Further code changes Includes a small refactor of `try` due to a type mismatch in its large match. # User-Facing Changes None for regular users. Plugin authors may have to update their matches on `Value` if they use `nu-protocol` Needs benchmarking to see if there is a benefit in real world workloads. **Update** small improvements in runtime for workloads with high volume of values. Significant reduction in maximum resident set size, when many values are held in memory. # Tests + Formatting
72 lines
1.9 KiB
Rust
72 lines
1.9 KiB
Rust
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Type, Value};
|
|
use reedline::Highlighter;
|
|
|
|
#[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)
|
|
.input_output_types(vec![(Type::String, Type::String)])
|
|
}
|
|
|
|
fn usage(&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 head = call.head;
|
|
|
|
let ctrlc = engine_state.ctrlc.clone();
|
|
let engine_state = std::sync::Arc::new(engine_state.clone());
|
|
let config = engine_state.get_config().clone();
|
|
|
|
let highlighter = crate::NuHighlighter {
|
|
engine_state,
|
|
config,
|
|
};
|
|
|
|
input.map(
|
|
move |x| match x.as_string() {
|
|
Ok(line) => {
|
|
let highlights = highlighter.highlight(&line, line.len());
|
|
|
|
Value::String {
|
|
val: highlights.render_simple(),
|
|
span: head,
|
|
}
|
|
}
|
|
Err(err) => Value::Error {
|
|
error: Box::new(err),
|
|
},
|
|
},
|
|
ctrlc,
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Describe the type of a string",
|
|
example: "'let x = 3' | nu-highlight",
|
|
result: None,
|
|
}]
|
|
}
|
|
}
|