extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 12:35:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add table literals (#2453)

Browse Source 
* Add table literals

* clippy
This commit is contained in:
Jonathan Turner
2020-08-30 16:55:33 +12:00
committed by GitHub
parent 84a6010f71
commit 6f69ae8707
6 changed files with 251 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/nu-protocol/src/hir.rs
View File

@ -716,6 +716,20 @@ impl PrettyDebugWithSource for SpannedExpression {
),
"]",
),
Expression::Table(_headers, cells) => b::delimit(
"[",
b::intersperse(
cells
.iter()
.map(|row| {
row.iter()
.map(|item| item.refined_pretty_debug(refine, source))
})
.flatten(),
b::space(),
),
"]",
),
Expression::Path(path) => path.pretty_debug(source),
Expression::FilePath(path) => b::typed("path", b::primitive(path.display())),
Expression::ExternalCommand(external) => {
@ -756,6 +770,17 @@ impl PrettyDebugWithSource for SpannedExpression {
),
"]",
),
Expression::Table(_headers, cells) => b::delimit(
"[",
b::intersperse(
cells
.iter()
.map(|row| row.iter().map(|item| item.pretty_debug(source)))
.flatten(),
b::space(),
),
"]",
),
Expression::Path(path) => path.pretty_debug(source),
Expression::FilePath(path) => b::typed("path", b::primitive(path.display())),
Expression::ExternalCommand(external) => b::typed(
@ -960,6 +985,7 @@ pub enum Expression {
Range(Box<Range>),
Block(hir::Block),
List(Vec<SpannedExpression>),
Table(Vec<SpannedExpression>, Vec<Vec<SpannedExpression>>),
Path(Box<Path>),
FilePath(PathBuf),
@ -985,6 +1011,7 @@ impl ShellTypeName for Expression {
Expression::FilePath(..) => "file path",
Expression::Variable(..) => "variable",
Expression::List(..) => "list",
Expression::Table(..) => "table",
Expression::Binary(..) => "binary",
Expression::Range(..) => "range",
Expression::Block(..) => "block",