print diagnositics without colors in testing context

components/lox-error-format/src/format.rs

@@ -8,7 +8,7 @@ use lox_ir::input_file::InputFile;
 pub struct FormatOptions {
     /// Whether or not errors should use rich formatting with colors. This is generally turned on,
     /// except in tests, where the escape codes obscure the error messages.
-    with_color: bool,
+    pub with_color: bool,
 }
 
 impl FormatOptions {

components/lox-execute/src/execute.rs

@@ -16,10 +16,11 @@ pub fn execute_file(
     db: &impl crate::Db,
     input_file: InputFile,
     kernel: &mut impl Kernel,
+    diagnostic_with_color: bool,
     step_inspect: Option<impl FnMut(Option<bytecode::Code>, &VM) + Clone>,
 ) {
     let main = main_function(db, input_file);
-    let mut vm = VM::new(main, db);
+    let mut vm = VM::new(db, main, diagnostic_with_color);
 
     while let ControlFlow::Next = vm.step(db, kernel, step_inspect.clone()) {}
 }

components/lox-execute/src/vm.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use lox_compile::compile_fn;
+use lox_error_format::FormatOptions;
 use lox_ir::{
     bytecode::{self, CompiledFunction},
     diagnostic::Diagnostics,
@@ -183,12 +184,14 @@ pub struct VM {
 
     pub stack: Vec<generational_arena::Index>,
 
+    diagnostic_with_color: bool,
+
     // global variables
     globals: HashMap<String, Value>,
 }
 
 impl VM {
-    pub fn new(main: Function, db: &dyn crate::Db) -> Self {
+    pub fn new(db: &dyn crate::Db, main: Function, diagnostic_with_color: bool) -> Self {
         let function = compile_fn(db, main);
         let frame = CallFrame {
             function,
@@ -206,6 +209,7 @@ impl VM {
             frames: vec![frame],
             heap,
             stack,
+            diagnostic_with_color,
             globals: HashMap::new(),
         }
     }
@@ -428,8 +432,14 @@ impl VM {
                         if diagnostics.is_empty() {
                             self.push_frame(compiled_function);
                         } else {
-                            let output =
-                                lox_error_format::format_diagnostics(db, &diagnostics).unwrap();
+                            let output = lox_error_format::format_diagnostics_with_options(
+                                db,
+                                &diagnostics,
+                                FormatOptions {
+                                    with_color: self.diagnostic_with_color,
+                                },
+                            )
+                            .unwrap();
                             kernel.print(&output);
                         }
                     }

components/lox-web/src/lib.rs

@@ -43,6 +43,7 @@ impl Compiler {
                 &self.db,
                 self.input_file,
                 &mut kernel,
+                true,
                 None::<fn(_, &lox_execute::VM)>,
             );
             kernel.take_buffer()

lox_tests/diagnostics/error_in_function/output

@@ -1,8 +1,8 @@
-Error: expected `;`
-   ╭─[/home/zhoufan/workspace/rust/lox/lox_tests/diagnostics/error_in_function.lox:2:18]
-   │
- 2 │     print "hello"
-   │                  ┬  
-   │                  ╰── here
-───╯
+Error: expected `;`
+   ╭─[/home/zhoufan/workspace/rust/lox/lox_tests/diagnostics/error_in_function.lox:2:18]
+   │
+ 2 │     print "hello"
+   │                  ┬  
+   │                  ╰── here
+───╯
 

src/main.rs

@@ -6,7 +6,6 @@ use std::{
 use clap::{Parser, Subcommand};
 use expect_test::expect_file;
 use lox_db::Database;
-use lox_error_format::FormatOptions;
 use lox_execute::kernel::{BufferKernel, StdoutKernel};
 use lox_ir::{diagnostic::Diagnostics, input_file::InputFile, word::Word};
 use salsa::DebugWithDb;
@@ -20,7 +19,6 @@ struct TestCase {
     syntax: PathBuf,
     bytecode: PathBuf,
     execute: PathBuf,
-    diagnostic: PathBuf,
     stdout: PathBuf,
     text: String,
 }
@@ -44,7 +42,6 @@ impl TestCase {
         let syntax = lox_dir.join("syntax");
         let bytecode = lox_dir.join("bytecode");
         let execute = lox_dir.join("execute");
-        let diagnostic = lox_dir.join("diagnostic");
         let output = lox_dir.join("output");
         let text = fs::read_to_string(&lox).unwrap();
         TestCase {
@@ -53,7 +50,6 @@ impl TestCase {
             syntax,
             bytecode,
             execute,
-            diagnostic,
             stdout: output,
             text,
         }
@@ -116,17 +112,6 @@ impl TestCase {
         }
         expect_file![self.syntax].assert_eq(&buf);
 
-        // test diagnostics
-        let diagnostics = lox_compile::compile_file::accumulated::<Diagnostics>(db, input_file);
-        let output = lox_error_format::format_diagnostics_with_options(
-            db,
-            &diagnostics,
-            FormatOptions::no_color(),
-        );
-        if let Ok(output) = output {
-            expect_file![self.diagnostic].assert_eq(&output);
-        }
-
         // test bytecode
         let chunk = lox_compile::compile_file(db, input_file);
         expect_file![self.bytecode].assert_eq(&format!("{:#?}", chunk));
@@ -145,7 +130,13 @@ impl TestCase {
 
         // test stdout
         let mut kernel = BufferKernel::new();
-        lox_execute::execute_file(db, input_file, &mut kernel, None::<fn(_, &lox_execute::VM)>);
+        lox_execute::execute_file(
+            db,
+            input_file,
+            &mut kernel,
+            false,
+            None::<fn(_, &lox_execute::VM)>,
+        );
         expect_file![self.stdout].assert_eq(kernel.buffer());
 
         println!("ok");
@@ -226,6 +217,7 @@ fn main() {
                     &db,
                     input_file,
                     &mut StdoutKernel {},
+                    true,
                     None::<fn(_, &lox_execute::VM)>,
                 );
             }