extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-17 04:31:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve table for lists

Browse Source
This commit is contained in:
JT 2021-09-26 06:37:25 +13:00
parent a2996abd47
commit 139775dcce
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/nu-command/src/table.rs
View File

@ -66,26 +66,30 @@ fn convert_to_table(iter: impl IntoIterator<Item = Value>) -> Option<nu_table::T
if let Some(first) = iter.peek() {
let mut headers = first.columns();
headers.insert(0, "#".into());
if !headers.is_empty() {
headers.insert(0, "#".into());
}
let mut data = vec![];
for (row_num, item) in iter.enumerate() {
let mut row = vec![row_num.to_string()];
for header in headers.iter().skip(1) {
let result = if header == "<value>" {
Ok(item.clone())
} else {
item.clone().follow_cell_path(&[PathMember::String {
val: header.into(),
span: Span::unknown(),
}])
};
if headers.is_empty() {
row.push(item.into_string())
} else {
for header in headers.iter().skip(1) {
let result = {
item.clone().follow_cell_path(&[PathMember::String {
val: header.into(),
span: Span::unknown(),
}])
};
match result {
Ok(value) => row.push(value.into_string()),
Err(_) => row.push(String::new()),
match result {
Ok(value) => row.push(value.into_string()),
Err(_) => row.push(String::new()),
}
}
}

2
crates/nu-protocol/src/value/mod.rs
View File

@ -290,7 +290,7 @@ impl Value {
pub fn columns(&self) -> Vec<String> {
match self {
Value::Record { cols, .. } => cols.clone(),
_ => vec!["<value>".into()],
_ => vec![],
}
}
}