Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-16 07:04:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compact nuon tables (#4596)

Browse source
This commit is contained in:
JT 2022-02-21 20:48:42 -05:00 committed by GitHub
parent 9888f8f298
commit 31925c3d40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/nu-command/src/formats/to/nuon.rs
View file

@ -1,3 +1,4 @@
use nu_engine::get_columns;
use nu_protocol::ast::{Call, RangeInclusion}; use nu_protocol::ast::{Call, RangeInclusion};
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{ use nu_protocol::{
@ -63,11 +64,36 @@ fn value_to_string(v: &Value, span: Span) -> Result<String, ShellError> {
Value::Float { val, .. } => Ok(format!("{}", *val)), Value::Float { val, .. } => Ok(format!("{}", *val)),
Value::Int { val, .. } => Ok(format!("{}", *val)), Value::Int { val, .. } => Ok(format!("{}", *val)),
Value::List { vals, .. } => { Value::List { vals, .. } => {
let mut collection = vec![]; let headers = get_columns(vals);
for val in vals { if vals.iter().all(|x| x.columns() == headers) {
collection.push(value_to_string(val, span)?); // Table output
let headers_output = headers.join(", ");
let mut table_output = vec![];
for val in vals {
let mut row = vec![];
if let Value::Record { vals, .. } = val {
for val in vals {
row.push(value_to_string(val, span)?);
}
}
table_output.push(row.join(", "));
}
Ok(format!(
"[[{}]; [{}]]",
headers_output,
table_output.join("], [")
))
} else {
let mut collection = vec![];
for val in vals {
collection.push(value_to_string(val, span)?);
}
Ok(format!("[{}]", collection.join(", ")))
} }
Ok(format!("[{}]", collection.join(", ")))
} }
Value::Nothing { .. } => Ok("$nothing".to_string()), Value::Nothing { .. } => Ok("$nothing".to_string()),
Value::Range { val, .. } => Ok(format!( Value::Range { val, .. } => Ok(format!(