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

compute the "space" separator dynamically

Browse Source 
This avoid hardcoding a " " in the field separation of the NUON
output, leading in trailing whitespaces when newlines are enabled.
This commit is contained in:
amtoine 2023-03-11 12:53:48 +01:00
parent 9159377af8
commit 73d0b64a3f
No known key found for this signature in database
GPG Key ID: 37AAE9B486CFF1AB
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/nu-command/src/formats/to/nuon.rs
View File

@ -112,7 +112,7 @@ pub fn value_to_string(
depth: usize, depth: usize,
indent: &Option<String>, indent: &Option<String>,
) -> Result<String, ShellError> { ) -> Result<String, ShellError> {
let nl = get_true_newline(indent); let (nl, sep) = get_true_separators(indent);
let idt = get_true_indentation(depth, indent); let idt = get_true_indentation(depth, indent);
let idt_po = get_true_indentation(depth + 1, indent); let idt_po = get_true_indentation(depth + 1, indent);
let idt_pt = get_true_indentation(depth + 2, indent); let idt_pt = get_true_indentation(depth + 2, indent);
@ -197,7 +197,7 @@ pub fn value_to_string(
} }
}) })
.collect(); .collect();
let headers_output = headers.join(&format!(", {nl}{idt_pt}")); let headers_output = headers.join(&format!(",{sep}{nl}{idt_pt}"));
let mut table_output = vec![]; let mut table_output = vec![];
for val in vals { for val in vals {
@ -214,13 +214,13 @@ pub fn value_to_string(
} }
} }
table_output.push(row.join(&format!(", {nl}{idt_pt}"))); table_output.push(row.join(&format!(",{sep}{nl}{idt_pt}")));
} }
Ok(format!( Ok(format!(
"[{nl}{idt_po}[{nl}{idt_pt}{}{nl}{idt_po}]; {nl}{idt_po}[{nl}{idt_pt}{}{nl}{idt_po}]{nl}{idt}]", "[{nl}{idt_po}[{nl}{idt_pt}{}{nl}{idt_po}];{sep}{nl}{idt_po}[{nl}{idt_pt}{}{nl}{idt_po}]{nl}{idt}]",
headers_output, headers_output,
table_output.join(&format!("{nl}{idt_po}], {nl}{idt_po}[{nl}{idt_pt}")) table_output.join(&format!("{nl}{idt_po}],{sep}{nl}{idt_po}[{nl}{idt_pt}"))
)) ))
} else { } else {
let mut collection = vec![]; let mut collection = vec![];
@ -232,7 +232,7 @@ pub fn value_to_string(
} }
Ok(format!( Ok(format!(
"[{nl}{}{nl}{idt}]", "[{nl}{}{nl}{idt}]",
collection.join(&format!(", {nl}")) collection.join(&format!(",{sep}{nl}"))
)) ))
} }
} }
@ -266,7 +266,7 @@ pub fn value_to_string(
} }
Ok(format!( Ok(format!(
"{{{nl}{}{nl}{idt}}}", "{{{nl}{}{nl}{idt}}}",
collection.join(&format!(", {nl}")) collection.join(&format!(",{sep}{nl}"))
)) ))
} }
Value::LazyRecord { val, .. } => { Value::LazyRecord { val, .. } => {
@ -286,10 +286,10 @@ fn get_true_indentation(depth: usize, indent: &Option<String>) -> String {
} }
} }
fn get_true_newline(indent: &Option<String>) -> String { fn get_true_separators(indent: &Option<String>) -> (String, String) {
match indent { match indent {
Some(_) => "\n".to_string(), Some(_) => ("\n".to_string(), "".to_string()),
None => "".to_string(), None => ("".to_string(), " ".to_string()),
} }
} }