WIP

crates/nu-cli/src/default_context.rs

@@ -1,13 +1,12 @@
 use std::{cell::RefCell, rc::Rc};
 
-use nu_parser::{ParserState, ParserWorkingSet};
-use nu_protocol::{Signature, SyntaxShape};
+use nu_protocol::{EngineState, Signature, StateWorkingSet, SyntaxShape};
 
-pub fn create_default_context() -> Rc<RefCell<ParserState>> {
-    let parser_state = Rc::new(RefCell::new(ParserState::new()));
+pub fn create_default_context() -> Rc<RefCell<EngineState>> {
+    let engine_state = Rc::new(RefCell::new(EngineState::new()));
     let delta = {
-        let parser_state = parser_state.borrow();
-        let mut working_set = ParserWorkingSet::new(&*parser_state);
+        let engine_state = engine_state.borrow();
+        let mut working_set = StateWorkingSet::new(&*engine_state);
 
         let sig =
             Signature::build("where").required("cond", SyntaxShape::RowCondition, "condition");
@@ -109,8 +108,8 @@ pub fn create_default_context() -> Rc<RefCell<ParserState>> {
     };
 
     {
-        ParserState::merge_delta(&mut *parser_state.borrow_mut(), delta);
+        EngineState::merge_delta(&mut *engine_state.borrow_mut(), delta);
     }
 
-    parser_state
+    engine_state
 }

crates/nu-cli/src/errors.rs

@@ -2,11 +2,11 @@ use core::ops::Range;
 
 use codespan_reporting::diagnostic::{Diagnostic, Label};
 use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
-use nu_parser::{ParseError, ParserWorkingSet};
-use nu_protocol::{ShellError, Span};
+use nu_parser::ParseError;
+use nu_protocol::{ShellError, Span, StateWorkingSet};
 
 fn convert_span_to_diag(
-    working_set: &ParserWorkingSet,
+    working_set: &StateWorkingSet,
     span: &Span,
 ) -> Result<(usize, Range<usize>), Box<dyn std::error::Error>> {
     for (file_id, (_, start, end)) in working_set.files().enumerate() {
@@ -22,7 +22,7 @@ fn convert_span_to_diag(
 }
 
 pub fn report_parsing_error(
-    working_set: &ParserWorkingSet,
+    working_set: &StateWorkingSet,
     error: &ParseError,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let writer = StandardStream::stderr(ColorChoice::Always);
@@ -236,7 +236,7 @@ pub fn report_parsing_error(
 }
 
 pub fn report_shell_error(
-    working_set: &ParserWorkingSet,
+    working_set: &StateWorkingSet,
     error: &ShellError,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let writer = StandardStream::stderr(ColorChoice::Always);

crates/nu-cli/src/syntax_highlight.rs

@@ -1,21 +1,22 @@
 use nu_ansi_term::Style;
-use nu_parser::{FlatShape, ParserState, ParserWorkingSet};
+use nu_parser::FlatShape;
+use nu_protocol::{EngineState, StateWorkingSet};
 use reedline::{Highlighter, StyledText};
 use std::{cell::RefCell, rc::Rc};
 
 pub struct NuHighlighter {
-    pub parser_state: Rc<RefCell<ParserState>>,
+    pub engine_state: Rc<RefCell<EngineState>>,
 }
 
 impl Highlighter for NuHighlighter {
     fn highlight(&self, line: &str) -> StyledText {
         let (shapes, global_span_offset) = {
-            let parser_state = self.parser_state.borrow();
-            let mut working_set = ParserWorkingSet::new(&*parser_state);
+            let engine_state = self.engine_state.borrow();
+            let mut working_set = StateWorkingSet::new(&*engine_state);
             let (block, _) = working_set.parse_source(line.as_bytes(), false);
 
             let shapes = working_set.flatten_block(&block);
-            (shapes, parser_state.next_span_start())
+            (shapes, engine_state.next_span_start())
         };
 
         let mut output = StyledText::default();