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

Start moving coloring into the token stream

Browse Source 
The benefit of this is that coloring can be made atomic alongside token
stream forwarding.

I put the feature behind a flag so I can continue to iterate on it
without possibly regressing existing functionality. It's a lot of places
where the flags have to go, but I expect it to be a short-lived flag,
and the flags are fully contained in the parser.
This commit is contained in:
Yehuda Katz
2019-10-14 16:11:00 -07:00
parent 473b6f727c
commit f20f3f56c7
15 changed files with 1808 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/shell/helper.rs
View File

@ -85,11 +85,27 @@ impl Highlighter for Helper {
let expand_context = self
.context
.expand_context(&text, Span::new(0, line.len() - 1));
let mut shapes = vec![];
// We just constructed a token list that only contains a pipeline, so it can't fail
color_fallible_syntax(&PipelineShape, &mut tokens, &expand_context, &mut shapes)
#[cfg(not(coloring_in_tokens))]
let shapes = {
let mut shapes = vec![];
color_fallible_syntax(
&PipelineShape,
&mut tokens,
&expand_context,
&mut shapes,
)
.unwrap();
shapes
};
#[cfg(coloring_in_tokens)]
let shapes = {
// We just constructed a token list that only contains a pipeline, so it can't fail
color_fallible_syntax(&PipelineShape, &mut tokens, &expand_context).unwrap();
tokens.shapes()
};
trace!(target: "nu::shapes",
"SHAPES :: {:?}",
@ -97,7 +113,7 @@ impl Highlighter for Helper {
);
for shape in shapes {
let styled = paint_flat_shape(shape, line);
let styled = paint_flat_shape(&shape, line);
out.push_str(&styled);
}
@ -135,7 +151,7 @@ fn vec_tag<T>(input: Vec<Tagged<T>>) -> Option<Tag> {
})
}
fn paint_flat_shape(flat_shape: Spanned<FlatShape>, line: &str) -> String {
fn paint_flat_shape(flat_shape: &Spanned<FlatShape>, line: &str) -> String {
let style = match &flat_shape.item {
FlatShape::OpenDelimiter(_) => Color::White.normal(),
FlatShape::CloseDelimiter(_) => Color::White.normal(),