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

Merge pull request #119 from nushell/error_improvement

Browse Source 
Error improvement
This commit is contained in:
JT
2021-10-12 07:08:16 +13:00
committed by GitHub
parent 1b9b709dec ba73e0eb06
commit c4fe190cee
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/nu-command/src/viewers/table.rs
View File

@ -1,6 +1,6 @@
use nu_protocol::ast::{Call, PathMember};
use nu_protocol::engine::{Command, EvaluationContext};
use nu_protocol::{Signature, Span, Value};
use nu_protocol::{ShellError, Signature, Span, Value};
use nu_table::StyledString;
use std::collections::HashMap;
use terminal_size::{Height, Width};
@ -35,7 +35,7 @@ impl Command for Table {
match input {
Value::List { vals, .. } => {
let table = convert_to_table(vals);
let table = convert_to_table(vals)?;
if let Some(table) = table {
let result = nu_table::draw_table(&table, term_width, &HashMap::new());
@ -49,7 +49,7 @@ impl Command for Table {
}
}
Value::Stream { stream, .. } => {
let table = convert_to_table(stream);
let table = convert_to_table(stream)?;
if let Some(table) = table {
let result = nu_table::draw_table(&table, term_width, &HashMap::new());
@ -91,12 +91,15 @@ impl Command for Table {
span: call.head,
})
}
Value::Error { error } => Err(error),
x => Ok(x),
}
}
}
fn convert_to_table(iter: impl IntoIterator<Item = Value>) -> Option<nu_table::Table> {
fn convert_to_table(
iter: impl IntoIterator<Item = Value>,
) -> Result<Option<nu_table::Table>, ShellError> {
let mut iter = iter.into_iter().peekable();
if let Some(first) = iter.peek() {
@ -109,6 +112,9 @@ fn convert_to_table(iter: impl IntoIterator<Item = Value>) -> Option<nu_table::T
let mut data = vec![];
for (row_num, item) in iter.enumerate() {
if let Value::Error { error } = item {
return Err(error);
}
let mut row = vec![row_num.to_string()];
if headers.is_empty() {
@ -135,7 +141,7 @@ fn convert_to_table(iter: impl IntoIterator<Item = Value>) -> Option<nu_table::T
data.push(row);
}
Some(nu_table::Table {
Ok(Some(nu_table::Table {
headers: headers
.into_iter()
.map(|x| StyledString {
@ -165,8 +171,8 @@ fn convert_to_table(iter: impl IntoIterator<Item = Value>) -> Option<nu_table::T
})
.collect(),
theme: nu_table::Theme::rounded(),
})
}))
} else {
None
Ok(None)
}
}