holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a simplified list view (#1749)

Browse Source
This commit is contained in:
Jonathan Turner
2020-05-11 14:47:27 +12:00
committed by GitHub
parent a2e9bbd358
commit 42eb658c37
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-protocol/src/type_shape.rs
View File

@ -239,7 +239,7 @@ impl PrettyDebug for Type {
row.map.iter().map(|(key, ty)| {
(b::key(match key {
Column::String(string) => string.clone(),
Column::Value => "<value>".to_string(),
Column::Value => "".to_string(),
}) + b::delimit("(", ty.pretty(), ")").into_kind())
.nest()
}),
@ -303,7 +303,7 @@ impl<'a> PrettyDebug for DebugEntry<'a> {
fn pretty(&self) -> DebugDocBuilder {
b::key(match self.key {
Column::String(string) => string.clone(),
Column::Value => "<value>".to_string(),
Column::Value => "".to_string(),
}) + b::delimit("(", self.value.pretty(), ")").into_kind()
}
}

6
crates/nu-protocol/src/value.rs
View File

@ -32,8 +32,10 @@ use std::time::SystemTime;
pub enum UntaggedValue {
/// A primitive (or fundamental) type of values
Primitive(Primitive),
/// A table row
Row(Dictionary),
/// A full inner (or embedded) table
Table(Vec<Value>),
@ -494,13 +496,13 @@ impl std::ops::Add for Value {
pub fn merge_descriptors(values: &[Value]) -> Vec<String> {
let mut ret: Vec<String> = vec![];
let value_column = "<value>".to_string();
let value_column = "".to_string();
for value in values {
let descs = value.data_descriptors();
if descs.is_empty() {
if !ret.contains(&value_column) {
ret.push("<value>".to_string());
ret.push("".to_string());
}
} else {
for desc in value.data_descriptors() {