mirror of
https://github.com/nushell/nushell.git
synced 2025-06-19 17:38:14 +02:00
6a7c00eaef
This commit should finish the `coloring_in_tokens` feature, which moves the shape accumulator into the token stream. This allows rollbacks of the token stream to also roll back any shapes that were added. This commit also adds a much nicer syntax highlighter trace, which shows all of the paths the highlighter took to arrive at a particular coloring output. This change is fairly substantial, but really improves the understandability of the flow. I intend to update the normal parser with a similar tracing view. In general, this change also fleshes out the concept of "atomic" token stream operations. A good next step would be to try to make the parser more error-correcting, using the coloring infrastructure. A follow-up step would involve merging the parser and highlighter shapes themselves.
85 lines
2.8 KiB
Rust
85 lines
2.8 KiB
Rust
use crate::parser::hir::syntax_shape::{
|
|
color_syntax, expand_syntax, ColorSyntax, ExpandContext, ExpressionListShape, TokenNode,
|
|
};
|
|
use crate::parser::{hir, hir::TokensIterator, Delimiter, FlatShape};
|
|
use crate::prelude::*;
|
|
|
|
pub fn expand_delimited_square(
|
|
children: &Vec<TokenNode>,
|
|
span: Span,
|
|
context: &ExpandContext,
|
|
) -> Result<hir::Expression, ShellError> {
|
|
let mut tokens = TokensIterator::new(&children, span, false);
|
|
|
|
let list = expand_syntax(&ExpressionListShape, &mut tokens, context);
|
|
|
|
Ok(hir::Expression::list(list?, Tag { span, anchor: None }))
|
|
}
|
|
|
|
#[cfg(not(coloring_in_tokens))]
|
|
pub fn color_delimited_square(
|
|
(open, close): (Span, Span),
|
|
children: &Vec<TokenNode>,
|
|
span: Span,
|
|
context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) {
|
|
shapes.push(FlatShape::OpenDelimiter(Delimiter::Square).spanned(open));
|
|
let mut tokens = TokensIterator::new(&children, span, false);
|
|
let _list = color_syntax(&ExpressionListShape, &mut tokens, context, shapes);
|
|
shapes.push(FlatShape::CloseDelimiter(Delimiter::Square).spanned(close));
|
|
}
|
|
|
|
#[cfg(coloring_in_tokens)]
|
|
pub fn color_delimited_square(
|
|
(open, close): (Span, Span),
|
|
token_nodes: &mut TokensIterator,
|
|
_span: Span,
|
|
context: &ExpandContext,
|
|
) {
|
|
token_nodes.color_shape(FlatShape::OpenDelimiter(Delimiter::Square).spanned(open));
|
|
let _list = color_syntax(&ExpressionListShape, token_nodes, context);
|
|
token_nodes.color_shape(FlatShape::CloseDelimiter(Delimiter::Square).spanned(close));
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub struct DelimitedShape;
|
|
|
|
#[cfg(not(coloring_in_tokens))]
|
|
impl ColorSyntax for DelimitedShape {
|
|
type Info = ();
|
|
type Input = (Delimiter, Span, Span);
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
(delimiter, open, close): &(Delimiter, Span, Span),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
shapes: &mut Vec<Spanned<FlatShape>>,
|
|
) -> Self::Info {
|
|
shapes.push(FlatShape::OpenDelimiter(*delimiter).spanned(*open));
|
|
color_syntax(&ExpressionListShape, token_nodes, context, shapes);
|
|
shapes.push(FlatShape::CloseDelimiter(*delimiter).spanned(*close));
|
|
}
|
|
}
|
|
|
|
#[cfg(coloring_in_tokens)]
|
|
impl ColorSyntax for DelimitedShape {
|
|
type Info = ();
|
|
type Input = (Delimiter, Span, Span);
|
|
|
|
fn name(&self) -> &'static str {
|
|
"DelimitedShape"
|
|
}
|
|
|
|
fn color_syntax<'a, 'b>(
|
|
&self,
|
|
(delimiter, open, close): &(Delimiter, Span, Span),
|
|
token_nodes: &'b mut TokensIterator<'a>,
|
|
context: &ExpandContext,
|
|
) -> Self::Info {
|
|
token_nodes.color_shape(FlatShape::OpenDelimiter(*delimiter).spanned(*open));
|
|
color_syntax(&ExpressionListShape, token_nodes, context);
|
|
token_nodes.color_shape(FlatShape::CloseDelimiter(*delimiter).spanned(*close));
|
|
}
|
|
}
|