Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 05:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/nushell/engine-q into parse-error

Browse source
This commit is contained in:
Fernando Herrera 2021-09-11 08:26:29 +01:00
commit 47ee50072e
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/nu-cli/src/syntax_highlight.rs
View file

@ -40,6 +40,7 @@ impl Highlighter for NuHighlighter {
.to_string();
match shape.1 {
FlatShape::External => output.push((Style::new().bold(), next_token)),
FlatShape::ExternalArg => output.push((Style::new().bold(), next_token)),
FlatShape::Garbage => output.push((
Style::new()
.fg(nu_ansi_term::Color::White)

11
crates/nu-parser/src/flatten.rs
View file

@ -10,6 +10,7 @@ pub enum FlatShape {
Range,
InternalCall,
External,
ExternalArg,
Literal,
Operator,
Signature,
@ -55,8 +56,14 @@ pub fn flatten_expression(
}
output
}
Expr::ExternalCall(..) => {
vec![(expr.span, FlatShape::External)]
Expr::ExternalCall(name, args) => {
let mut output = vec![(*name, FlatShape::External)];
for arg in args {
output.push((*arg, FlatShape::ExternalArg));
}
output
}
Expr::Garbage => {
vec![(expr.span, FlatShape::Garbage)]

6
crates/nu-parser/src/parser.rs
View file

@ -80,14 +80,14 @@ fn check_name(working_set: &mut StateWorkingSet, spans: &[Span]) -> Option<Parse
}
pub fn parse_external_call(
working_set: &mut StateWorkingSet,
_working_set: &mut StateWorkingSet,
spans: &[Span],
) -> (Expression, Option<ParseError>) {
// TODO: add external parsing
let mut args = vec![];
let name = working_set.get_span_contents(spans[0]).to_vec();
let name = spans[0];
for span in &spans[1..] {
args.push(working_set.get_span_contents(*span).to_vec());
args.push(*span);
}
(
Expression {

2
crates/nu-protocol/src/ast/expr.rs
View file

@ -13,7 +13,7 @@ pub enum Expr {
),
Var(VarId),
Call(Box<Call>),
ExternalCall(Vec<u8>, Vec<Vec<u8>>),
ExternalCall(Span, Vec<Span>),
Operator(Operator),
RowCondition(VarId, Box<Expression>),
BinaryOp(Box<Expression>, Box<Expression>, Box<Expression>), //lhs, op, rhs

3
crates/nu-table/src/table.rs
View file

@ -685,6 +685,7 @@ impl WrappedTable {
);
}
}
output.push('\n');
}
SeparatorPosition::Middle => {
for column in self.column_widths.iter().enumerate() {
@ -728,6 +729,7 @@ impl WrappedTable {
.push_str(&sep_color.paint(&self.theme.center.to_string()).to_string());
}
}
output.push('\n');
}
SeparatorPosition::Bottom => {
for column in self.column_widths.iter().enumerate() {
@ -774,7 +776,6 @@ impl WrappedTable {
}
}
}
output.push('\n');
output
}