refactor(core/js_error): Align JSStackFrame with CallSite (#4715)

Renames and adds missing fields to JSStackFrame from CallSite. Fixes #4705.

Cleans up base changes for line and column numbers.

1 files changed, 5 insertions, 3 deletions

diff --git a/cli/diagnostics.rs b/cli/diagnostics.rs
index d73004b21..b0b284360 100644
--- a/cli/diagnostics.rs
+++ b/cli/diagnostics.rs
@@ -232,9 +232,10 @@ impl DisplayFormatter for DiagnosticItem {
   }
 
   fn format_source_line(&self, level: usize) -> String {
+    // Formatter expects 1-based line numbers, but ours are 0-based.
     format_maybe_source_line(
       self.source_line.clone(),
-      self.line_number,
+      self.line_number.map(|n| n + 1),
       self.start_column,
       self.end_column,
       match self.category {
@@ -246,10 +247,11 @@ impl DisplayFormatter for DiagnosticItem {
   }
 
   fn format_source_name(&self) -> String {
+    // Formatter expects 1-based line and column numbers, but ours are 0-based.
     format_maybe_source_name(
       self.script_resource_name.clone(),
-      self.line_number,
-      self.start_column,
+      self.line_number.map(|n| n + 1),
+      self.start_column.map(|n| n + 1),
     )
   }
 }