From 00ba18843f0690526407902083d53c3b41caf273 Mon Sep 17 00:00:00 2001
From: Don Isaac <donald.isaac@gmail.com>
Date: Wed, 28 Aug 2024 22:11:52 -0400
Subject: [PATCH] refactor(diagnostic): change how diagnostic codes are
 rendered

---
 crates/oxc_diagnostics/src/graphic_reporter.rs |  9 +++++++--
 crates/oxc_diagnostics/src/lib.rs              |  6 +-----
 tasks/transform_conformance/babel.snap.md      | 10 ++++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/crates/oxc_diagnostics/src/graphic_reporter.rs b/crates/oxc_diagnostics/src/graphic_reporter.rs
index d3bdee7827155..488d4db8ffb55 100644
--- a/crates/oxc_diagnostics/src/graphic_reporter.rs
+++ b/crates/oxc_diagnostics/src/graphic_reporter.rs
@@ -188,7 +188,7 @@ impl GraphicalReportHandler {
         f: &mut impl fmt::Write,
         diagnostic: &(dyn Diagnostic),
     ) -> fmt::Result {
-        self.render_header(f, diagnostic)?;
+        // self.render_header(f, diagnostic)?;
         writeln!(f)?;
         self.render_causes(f, diagnostic)?;
         let src = diagnostic.source_code();
@@ -271,7 +271,12 @@ impl GraphicalReportHandler {
             opts = opts.word_splitter(word_splitter);
         }
 
-        let title = format!("{}", diagnostic.to_string().style(severity_style));
+        let title = if let Some(code) = diagnostic.code() {
+            format!("{code}: {diagnostic}")
+        } else {
+            diagnostic.to_string()
+        };
+        let title = format!("{}", title.style(severity_style));
         let title = textwrap::fill(&title, opts);
         writeln!(f, "{}", title)?;
 
diff --git a/crates/oxc_diagnostics/src/lib.rs b/crates/oxc_diagnostics/src/lib.rs
index f4a51c1b13cc7..7aeb9bc734228 100644
--- a/crates/oxc_diagnostics/src/lib.rs
+++ b/crates/oxc_diagnostics/src/lib.rs
@@ -75,9 +75,6 @@ pub struct OxcDiagnosticInner {
 
 impl fmt::Display for OxcDiagnostic {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.code.is_some() {
-            write!(f, "{}: ", &self.code)?;
-        }
         write!(f, "{}", &self.message)
     }
 }
@@ -102,8 +99,7 @@ impl Diagnostic for OxcDiagnostic {
     }
 
     fn code<'a>(&'a self) -> Option<Box<dyn Display + 'a>> {
-        // self.code.is_some().then(|| Box::new(&self.code) as Box<dyn Display>)
-        None
+        self.code.is_some().then(|| Box::new(&self.code) as Box<dyn Display>)
     }
 }
 
diff --git a/tasks/transform_conformance/babel.snap.md b/tasks/transform_conformance/babel.snap.md
index d78da5bdda98f..f915117d25f9b 100644
--- a/tasks/transform_conformance/babel.snap.md
+++ b/tasks/transform_conformance/babel.snap.md
@@ -2146,8 +2146,9 @@ failed to resolve query: failed to parse the rest of input: ...''
 
 
 * class/accessor-allowDeclareFields-false/input.ts
-  x TS(18010): An accessibility modifier cannot be used with a private
-  | identifier.
+TS(18010)
+
+  x An accessibility modifier cannot be used with a private identifier.
    ,-[tasks/coverage/babel/packages/babel-plugin-transform-typescript/test/fixtures/class/accessor-allowDeclareFields-false/input.ts:8:3]
  7 |   abstract accessor prop6: number;
  8 |   private accessor #p: any;
@@ -2157,8 +2158,9 @@ failed to resolve query: failed to parse the rest of input: ...''
 
 
 * class/accessor-allowDeclareFields-true/input.ts
-  x TS(18010): An accessibility modifier cannot be used with a private
-  | identifier.
+TS(18010)
+
+  x An accessibility modifier cannot be used with a private identifier.
    ,-[tasks/coverage/babel/packages/babel-plugin-transform-typescript/test/fixtures/class/accessor-allowDeclareFields-true/input.ts:8:3]
  7 |   abstract accessor prop6: number;
  8 |   private accessor #p: any;