extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-25 15:01:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add flag for collapsing empty columns

Browse Source
This commit is contained in:
Oskar Skog 2019-08-27 14:30:09 +03:00
parent 8445cda291
commit 14f6b49483
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/split_column.rs
View File

@ -8,6 +8,8 @@ use log::trace;
struct SplitColumnArgs { struct SplitColumnArgs {
separator: Tagged<String>, separator: Tagged<String>,
rest: Vec<Tagged<String>>, rest: Vec<Tagged<String>>,
#[serde(rename(deserialize = "collapse-empty"))]
collapse_empty: bool,
} }
pub struct SplitColumn; pub struct SplitColumn;
@ -28,12 +30,13 @@ impl WholeStreamCommand for SplitColumn {
fn signature(&self) -> Signature { fn signature(&self) -> Signature {
Signature::build("split-column") Signature::build("split-column")
.required("separator", SyntaxType::Any) .required("separator", SyntaxType::Any)
.switch("collapse-empty")
.rest() .rest()
} }
} }
fn split_column( fn split_column(
SplitColumnArgs { separator, rest }: SplitColumnArgs, SplitColumnArgs { separator, rest, collapse_empty}: SplitColumnArgs,
RunnableContext { input, name, .. }: RunnableContext, RunnableContext { input, name, .. }: RunnableContext,
) -> Result<OutputStream, ShellError> { ) -> Result<OutputStream, ShellError> {
Ok(input Ok(input
@ -43,8 +46,8 @@ fn split_column(
let splitter = separator.replace("\\n", "\n"); let splitter = separator.replace("\\n", "\n");
trace!("splitting with {:?}", splitter); trace!("splitting with {:?}", splitter);
let split_result: Vec<_> = if splitter.chars().all(|c| c.is_whitespace()) { let split_result: Vec<_> = if collapse_empty {
s.split(&splitter).filter(|s| *s != "").collect() s.split(&splitter).filter(|s| !s.is_empty()).collect()
} else { } else {
s.split(&splitter).collect() s.split(&splitter).collect()
}; };