refactor: update graphical

oxc-project · Oct 27, 2024 · f611cce · f611cce
1 parent c23ddaf
commit f611cce
Show file tree

Hide file tree

Showing 6 changed files with 2,487 additions and 2,504 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,7 +50,7 @@ regex = "1.11"
 lazy_static = "1.5"
 
 serde_json = "1.0.132"
-strip-ansi-escapes = "0.2.0"
+# strip-ansi-escapes = "0.2.0"
 
 [features]
 default = ["derive"]

diff --git a/src/handler.rs b/src/handler.rs
@@ -282,30 +282,30 @@ impl MietteHandlerOpts {
             } else {
                 ThemeStyles::none()
             };
-            #[cfg(not(feature = "syntect-highlighter"))]
-            let highlighter = self.highlighter.unwrap_or_else(MietteHighlighter::nocolor);
-            #[cfg(feature = "syntect-highlighter")]
-            let highlighter = if self.color == Some(false) {
-                MietteHighlighter::nocolor()
-            } else if self.color == Some(true) || syscall::supports_color() {
-                match self.highlighter {
-                    Some(highlighter) => highlighter,
-                    None => match self.rgb_colors {
-                        // Because the syntect highlighter currently only supports 24-bit truecolor,
-                        // respect RgbColor::Never by disabling the highlighter.
-                        // TODO: In the future, find a way to convert the RGB syntect theme
-                        // into an ANSI color theme.
-                        RgbColors::Never => MietteHighlighter::nocolor(),
-                        _ => MietteHighlighter::syntect_truecolor(),
-                    },
-                }
-            } else {
-                MietteHighlighter::nocolor()
-            };
+            // #[cfg(not(feature = "syntect-highlighter"))]
+            // let highlighter = self.highlighter.unwrap_or_else(MietteHighlighter::nocolor);
+            // #[cfg(feature = "syntect-highlighter")]
+            // let highlighter = if self.color == Some(false) {
+            // MietteHighlighter::nocolor()
+            // } else if self.color == Some(true) || syscall::supports_color() {
+            // match self.highlighter {
+            // Some(highlighter) => highlighter,
+            // None => match self.rgb_colors {
+            // // Because the syntect highlighter currently only supports 24-bit truecolor,
+            // // respect RgbColor::Never by disabling the highlighter.
+            // // TODO: In the future, find a way to convert the RGB syntect theme
+            // // into an ANSI color theme.
+            // RgbColors::Never => MietteHighlighter::nocolor(),
+            // _ => MietteHighlighter::syntect_truecolor(),
+            // },
+            // }
+            // } else {
+            // MietteHighlighter::nocolor()
+            // };
             let theme = self.theme.unwrap_or(GraphicalTheme { characters, styles });
             let mut handler =
                 GraphicalReportHandler::new_themed(theme).with_width(width).with_links(linkify);
-            handler.highlighter = highlighter;
+            // handler.highlighter = highlighter;
             if let Some(with_cause_chain) = self.with_cause_chain {
                 if with_cause_chain {
                     handler = handler.with_cause_chain();