2019-08-19 07:16:39 +02:00
|
|
|
use crate::commands::WholeStreamCommand;
|
2019-11-21 15:33:14 +01:00
|
|
|
|
2019-06-01 05:43:59 +02:00
|
|
|
use crate::prelude::*;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
2020-04-26 19:26:02 +02:00
|
|
|
use nu_protocol::{Dictionary, Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
|
2019-06-01 05:43:59 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
pub struct Trim;
|
|
|
|
|
|
|
|
impl WholeStreamCommand for Trim {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"trim"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("trim")
|
|
|
|
}
|
2019-08-30 00:52:32 +02:00
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Trim leading and following whitespace from text data."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
trim(args, registry)
|
|
|
|
}
|
2020-05-18 09:11:37 +02:00
|
|
|
|
2020-05-18 17:40:44 +02:00
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![Example {
|
2020-05-18 09:11:37 +02:00
|
|
|
description: "Trims surrounding whitespace and outputs \"Hello world\"",
|
|
|
|
example: "echo \" Hello world\" | trim",
|
2020-05-18 17:40:44 +02:00
|
|
|
result: Some(vec![Value::from("Hello world")]),
|
2020-05-18 09:11:37 +02:00
|
|
|
}]
|
|
|
|
}
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
|
|
|
|
2020-04-26 19:26:02 +02:00
|
|
|
fn trim_primitive(p: &mut Primitive) {
|
|
|
|
match p {
|
|
|
|
Primitive::String(s) | Primitive::Line(s) => *p = Primitive::String(s.trim().to_string()),
|
|
|
|
Primitive::Nothing
|
|
|
|
| Primitive::Int(_)
|
|
|
|
| Primitive::Decimal(_)
|
|
|
|
| Primitive::Bytes(_)
|
|
|
|
| Primitive::ColumnPath(_)
|
|
|
|
| Primitive::Pattern(_)
|
|
|
|
| Primitive::Boolean(_)
|
|
|
|
| Primitive::Date(_)
|
|
|
|
| Primitive::Duration(_)
|
|
|
|
| Primitive::Range(_)
|
|
|
|
| Primitive::Path(_)
|
|
|
|
| Primitive::Binary(_)
|
|
|
|
| Primitive::BeginningOfStream
|
|
|
|
| Primitive::EndOfStream => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn trim_row(d: &mut Dictionary) {
|
|
|
|
for (_, mut value) in d.entries.iter_mut() {
|
|
|
|
trim_value(&mut value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn trim_value(v: &mut Value) {
|
|
|
|
match &mut v.value {
|
|
|
|
UntaggedValue::Primitive(p) => trim_primitive(p),
|
|
|
|
UntaggedValue::Row(row) => trim_row(row),
|
|
|
|
_ => (),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
fn trim(args: CommandArgs, _registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
Move external closer to internal (#1611)
* Refactor InputStream and affected commands.
First, making `values` private and leaning on the `Stream` implementation makes
consumes of `InputStream` less likely to have to change in the future, if we
change what an `InputStream` is internally.
Second, we're dropping `Option<InputStream>` as the input to pipelines,
internals, and externals. Instead, `InputStream.is_empty` can be used to check
for "emptiness". Empty streams are typically only ever used as the first input
to a pipeline.
* Add run_external internal command.
We want to push external commands closer to internal commands, eventually
eliminating the concept of "external" completely. This means we can consolidate
a couple of things:
- Variable evaluation (for example, `$it`, `$nu`, alias vars)
- Behaviour of whole stream vs per-item external execution
It should also make it easier for us to start introducing argument signatures
for external commands,
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
2020-04-20 05:30:44 +02:00
|
|
|
Ok(args
|
|
|
|
.input
|
2020-04-26 19:26:02 +02:00
|
|
|
.map(|v| {
|
|
|
|
let mut trimmed = v;
|
|
|
|
trim_value(&mut trimmed);
|
|
|
|
ReturnSuccess::value(trimmed)
|
2019-07-09 06:31:26 +02:00
|
|
|
})
|
2019-07-03 22:31:15 +02:00
|
|
|
.to_output_stream())
|
2019-06-01 05:43:59 +02:00
|
|
|
}
|
2020-05-18 14:56:01 +02:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::Trim;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn examples_work_as_expected() {
|
|
|
|
use crate::examples::test as test_examples;
|
|
|
|
|
|
|
|
test_examples(Trim {})
|
|
|
|
}
|
|
|
|
}
|