extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-14 20:44:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove the hard coded escaping from split row and split column (#4731)

Browse Source
This commit is contained in:
Darren Schroeder 2022-03-04 15:09:35 -06:00 committed by GitHub
parent 02dfb57ed1
commit 5b3cc73ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-command/src/strings/split/column.rs
View File

@ -114,12 +114,10 @@ fn split_column_helper(
head: Span,
) -> Vec<Value> {
if let Ok(s) = v.as_string() {
let splitter = separator.item.replace("\\n", "\n");
let split_result: Vec<_> = if collapse_empty {
s.split(&splitter).filter(|s| !s.is_empty()).collect()
s.split(&separator.item).filter(|s| !s.is_empty()).collect()
} else {
s.split(&splitter).collect()
s.split(&separator.item).collect()
};
let positional: Vec<_> = rest.iter().map(|f| f.item.clone()).collect();

3
crates/nu-command/src/strings/split/row.rs
View File

@ -86,8 +86,7 @@ fn split_row_helper(v: &Value, separator: &Spanned<String>, name: Span) -> Vec<V
match v.span() {
Ok(v_span) => {
if let Ok(s) = v.as_string() {
let splitter = separator.item.replace("\\n", "\n");
s.split(&splitter)
s.split(&separator.item)
.filter_map(|s| {
if s.trim() != "" {
Some(Value::string(s, v_span))