AnnotateSnippetEmitter

Author: nilehmann

crates/flux-errors/src/lib.rs

@@ -17,10 +17,7 @@ use rustc_errors::{
     json::JsonEmitter,
     translation::Translator,
 };
-use rustc_session::{
-    config::{self, ErrorOutputType},
-    parse::ParseSess,
-};
+use rustc_session::{config, parse::ParseSess};
 use rustc_span::source_map::SourceMap;
 
 pub struct FluxSession {
@@ -75,43 +72,99 @@ impl FluxSession {
 }
 
 fn emitter(
-    opts: &config::Options,
+    sopts: &config::Options,
     source_map: Arc<SourceMap>,
     fallback_fluent_bundle: LazyFallbackBundle,
 ) -> Box<dyn Emitter + sync::DynSend> {
-    let track_diagnostics = opts.unstable_opts.track_diagnostics;
-
     let translator = Translator { fluent_bundle: None, fallback_fluent_bundle };
-    match opts.error_format {
-        ErrorOutputType::HumanReadable { kind, color_config } => {
+
+    // All the code below is copied from rustc
+    let macro_backtrace = sopts.unstable_opts.macro_backtrace;
+    let track_diagnostics = sopts.unstable_opts.track_diagnostics;
+    let terminal_url = match sopts.unstable_opts.terminal_urls {
+        rustc_errors::TerminalUrl::Auto => {
+            match (std::env::var("COLORTERM").as_deref(), std::env::var("TERM").as_deref()) {
+                (Ok("truecolor"), Ok("xterm-256color"))
+                    if sopts.unstable_features.is_nightly_build() =>
+                {
+                    rustc_errors::TerminalUrl::Yes
+                }
+                _ => rustc_errors::TerminalUrl::No,
+            }
+        }
+        t => t,
+    };
+
+    let source_map = if sopts.unstable_opts.link_only { None } else { Some(source_map) };
+
+    match sopts.error_format {
+        config::ErrorOutputType::HumanReadable { kind, color_config } => {
+            let short = kind.short();
+
             if let HumanReadableErrorType::AnnotateSnippet = kind {
                 let emitter =
-                    AnnotateSnippetEmitter::new(Some(source_map), translator, false, false);
-                Box::new(emitter)
+                    AnnotateSnippetEmitter::new(stderr_destination(color_config), translator)
+                        .sm(source_map)
+                        .short_message(short)
+                        .diagnostic_width(sopts.diagnostic_width)
+                        .macro_backtrace(macro_backtrace)
+                        .track_diagnostics(track_diagnostics)
+                        .terminal_url(terminal_url)
+                        .theme(if let HumanReadableErrorType::Unicode = kind {
+                            rustc_errors::emitter::OutputTheme::Unicode
+                        } else {
+                            rustc_errors::emitter::OutputTheme::Ascii
+                        })
+                        .ignored_directories_in_source_blocks(
+                            sopts
+                                .unstable_opts
+                                .ignore_directory_in_diagnostics_source_blocks
+                                .clone(),
+                        );
+                Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
             } else {
-                let dst = stderr_destination(color_config);
-                let emitter = HumanEmitter::new(dst, translator)
-                    .sm(Some(source_map))
-                    .short_message(kind.short())
-                    .diagnostic_width(opts.diagnostic_width)
+                let emitter = HumanEmitter::new(stderr_destination(color_config), translator)
+                    .sm(source_map)
+                    .short_message(short)
+                    .diagnostic_width(sopts.diagnostic_width)
+                    .macro_backtrace(macro_backtrace)
                     .track_diagnostics(track_diagnostics)
-                    .terminal_url(opts.unstable_opts.terminal_urls);
-                Box::new(emitter)
+                    .terminal_url(terminal_url)
+                    .theme(if let HumanReadableErrorType::Unicode = kind {
+                        rustc_errors::emitter::OutputTheme::Unicode
+                    } else {
+                        rustc_errors::emitter::OutputTheme::Ascii
+                    })
+                    .ignored_directories_in_source_blocks(
+                        sopts
+                            .unstable_opts
+                            .ignore_directory_in_diagnostics_source_blocks
+                            .clone(),
+                    );
+                Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
             }
         }
-        ErrorOutputType::Json { pretty, json_rendered, color_config } => {
+        config::ErrorOutputType::Json { pretty, json_rendered, color_config } => {
             Box::new(
                 JsonEmitter::new(
                     Box::new(io::BufWriter::new(io::stderr())),
-                    Some(source_map),
+                    source_map,
                     translator,
                     pretty,
                     json_rendered,
                     color_config,
                 )
+                .ui_testing(sopts.unstable_opts.ui_testing)
+                .ignored_directories_in_source_blocks(
+                    sopts
+                        .unstable_opts
+                        .ignore_directory_in_diagnostics_source_blocks
+                        .clone(),
+                )
+                .diagnostic_width(sopts.diagnostic_width)
+                .macro_backtrace(macro_backtrace)
                 .track_diagnostics(track_diagnostics)
-                .diagnostic_width(opts.diagnostic_width)
-                .terminal_url(opts.unstable_opts.terminal_urls),
+                .terminal_url(terminal_url),
             )
         }
     }