From dd4e59d627b6de4f307941240feeccf1136b1648 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Mon, 24 Jun 2019 16:00:16 +1200 Subject: [PATCH 1/2] Fix coloring of commands --- src/shell/helper.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shell/helper.rs b/src/shell/helper.rs index 101b45a971..83a21d6b98 100644 --- a/src/shell/helper.rs +++ b/src/shell/helper.rs @@ -97,6 +97,7 @@ impl Highlighter for Helper { } fn paint_token_node(token_node: &TokenNode, line: &str) -> String { + //println!("{:?}", token_node); let styled = match token_node { TokenNode::Call(..) => Color::Cyan.bold().paint(token_node.span().slice(line)), TokenNode::Whitespace(..) => Color::White.normal().paint(token_node.span().slice(line)), @@ -105,7 +106,7 @@ fn paint_token_node(token_node: &TokenNode, line: &str) -> String { TokenNode::Path(..) => Color::Green.bold().paint(token_node.span().slice(line)), TokenNode::Error(..) => Color::Red.bold().paint(token_node.span().slice(line)), TokenNode::Delimited(..) => Color::White.paint(token_node.span().slice(line)), - TokenNode::Operator(..) => Color::Purple.bold().paint(token_node.span().slice(line)), + TokenNode::Operator(..) => Color::White.normal().paint(token_node.span().slice(line)), TokenNode::Pipeline(..) => Color::Blue.normal().paint(token_node.span().slice(line)), TokenNode::Token(Spanned { item: RawToken::Integer(..), @@ -139,7 +140,7 @@ fn paint_pipeline_element(pipeline_element: &PipelineElement, line: &str) -> Str styled.push_str(&Color::White.normal().paint(ws.slice(line))); } - styled.push_str(&paint_token_node(pipeline_element.call().head(), line)); + styled.push_str(&Color::Cyan.bold().paint(pipeline_element.call().head().span().slice(line)).to_string()); if let Some(children) = pipeline_element.call().children() { for child in children { From dea5ff17c3db112cdfe0ae206b4ff23ef13074a4 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Mon, 24 Jun 2019 16:13:01 +1200 Subject: [PATCH 2/2] Remove println --- src/shell/helper.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/shell/helper.rs b/src/shell/helper.rs index 83a21d6b98..1bb69ed1e5 100644 --- a/src/shell/helper.rs +++ b/src/shell/helper.rs @@ -97,7 +97,6 @@ impl Highlighter for Helper { } fn paint_token_node(token_node: &TokenNode, line: &str) -> String { - //println!("{:?}", token_node); let styled = match token_node { TokenNode::Call(..) => Color::Cyan.bold().paint(token_node.span().slice(line)), TokenNode::Whitespace(..) => Color::White.normal().paint(token_node.span().slice(line)),