forked from extern/nushell
7efb31a4e4
Restructure and streamline token expansion The purpose of this commit is to streamline the token expansion code, by removing aspects of the code that are no longer relevant, removing pointless duplication, and eliminating the need to pass the same arguments to `expand_syntax`. The first big-picture change in this commit is that instead of a handful of `expand_` functions, which take a TokensIterator and ExpandContext, a smaller number of methods on the `TokensIterator` do the same job. The second big-picture change in this commit is fully eliminating the coloring traits, making coloring a responsibility of the base expansion implementations. This also means that the coloring tracer is merged into the expansion tracer, so you can follow a single expansion and see how the expansion process produced colored tokens. One side effect of this change is that the expander itself is marginally more error-correcting. The error correction works by switching from structured expansion to `BackoffColoringMode` when an unexpected token is found, which guarantees that all spans of the source are colored, but may not be the most optimal error recovery strategy. That said, because `BackoffColoringMode` only extends as far as a closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in fairly granular correction strategy. The current code still produces an `Err` (plus a complete list of colored shapes) from the parsing process if any errors are encountered, but this could easily be addressed now that the underlying expansion is error-correcting. This commit also colors any spans that are syntax errors in red, and causes the parser to include some additional information about what tokens were expected at any given point where an error was encountered, so that completions and hinting could be more robust in the future. Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com> Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
104 lines
2.8 KiB
Rust
104 lines
2.8 KiB
Rust
use crate::hir::syntax_shape::{ExpandSyntax, FlatShape, NumberShape, VariableShape};
|
|
use crate::hir::TokensIterator;
|
|
use crate::hir::{Expression, SpannedExpression};
|
|
use crate::parse::token_tree::{BareType, StringType};
|
|
use nu_errors::ParseError;
|
|
use nu_source::{b, DebugDocBuilder, HasSpan, PrettyDebugWithSource, Span};
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct CoerceStringShape;
|
|
|
|
impl ExpandSyntax for CoerceStringShape {
|
|
type Output = Result<SpannedExpression, ParseError>;
|
|
|
|
fn name(&self) -> &'static str {
|
|
"StringShape"
|
|
}
|
|
|
|
fn expand<'a, 'b>(
|
|
&self,
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
) -> Result<SpannedExpression, ParseError> {
|
|
token_nodes
|
|
.expand_token(StringType, |(inner, outer)| {
|
|
Ok((
|
|
FlatShape::String,
|
|
Expression::string(inner).into_expr(outer),
|
|
))
|
|
})
|
|
.or_else(|_| {
|
|
token_nodes.expand_token(BareType, |span| {
|
|
Ok((FlatShape::String, Expression::string(span).into_expr(span)))
|
|
})
|
|
})
|
|
.or_else(|_| {
|
|
token_nodes
|
|
.expand_syntax(NumberShape)
|
|
.map(|number| Expression::string(number.span()).into_expr(number.span()))
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct StringExpressionShape;
|
|
|
|
impl ExpandSyntax for StringExpressionShape {
|
|
type Output = Result<SpannedExpression, ParseError>;
|
|
|
|
fn name(&self) -> &'static str {
|
|
"string"
|
|
}
|
|
|
|
fn expand<'a, 'b>(
|
|
&self,
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
) -> Result<SpannedExpression, ParseError> {
|
|
token_nodes.expand_syntax(VariableShape).or_else(|_| {
|
|
token_nodes.expand_token(StringType, |(inner, outer)| {
|
|
Ok((
|
|
FlatShape::String,
|
|
Expression::string(inner).into_expr(outer),
|
|
))
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct StringSyntax {
|
|
pub inner: Span,
|
|
pub span: Span,
|
|
}
|
|
|
|
impl HasSpan for StringSyntax {
|
|
fn span(&self) -> Span {
|
|
self.span
|
|
}
|
|
}
|
|
|
|
impl PrettyDebugWithSource for StringSyntax {
|
|
fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
|
|
b::primitive(self.span.slice(source))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct StringShape;
|
|
|
|
impl ExpandSyntax for StringShape {
|
|
type Output = Result<StringSyntax, ParseError>;
|
|
|
|
fn name(&self) -> &'static str {
|
|
"string"
|
|
}
|
|
|
|
fn expand<'a, 'b>(
|
|
&self,
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
) -> Result<StringSyntax, ParseError> {
|
|
token_nodes.expand_token(StringType, |(inner, outer)| {
|
|
Ok((FlatShape::String, StringSyntax { inner, span: outer }))
|
|
})
|
|
}
|
|
}
|