fixup! fix(cli/fmt_errors): don't panic on source line formatting errors

Author: nayeemrmn

cli/fmt_errors.rs

@@ -177,6 +177,9 @@ fn format_maybe_source_line(
   if source_line.is_empty() || source_line.len() > SOURCE_ABBREV_THRESHOLD {
     return "".to_string();
   }
+  if source_line.contains("Couldn't format source line: ") {
+    return format!("\n{}", source_line);
+  }
 
   assert!(start_column.is_some());
   assert!(end_column.is_some());
@@ -185,11 +188,10 @@ fn format_maybe_source_line(
   let end_column = end_column.unwrap();
 
   if start_column as usize >= source_line.len() {
-    eprintln!(
-      "{} Couldn't format source line: Column {} is out of bounds (source may have changed at runtime)",
+    return format!(
+      "\n{} Couldn't format source line: Column {} is out of bounds (source may have changed at runtime)",
       crate::colors::yellow("Warning"), start_column + 1,
     );
-    return "".to_string();
   }
 
   // TypeScript uses `~` always, but V8 would utilise `^` always, even when

cli/proc_state.rs

@@ -618,18 +618,17 @@ impl SourceMapGetter for ProcState {
     line_number: usize,
   ) -> Option<String> {
     if let Ok(specifier) = resolve_url(file_name) {
-      self.file_fetcher.get_source(&specifier).and_then(|out| {
+      self.file_fetcher.get_source(&specifier).map(|out| {
         // Do NOT use .lines(): it skips the terminating empty line.
         // (due to internally using .split_terminator() instead of .split())
         let lines: Vec<&str> = out.source.split('\n').collect();
         if line_number >= lines.len() {
-          eprintln!(
+          format!(
             "{} Couldn't format source line: Line {} is out of bounds (source may have changed at runtime)",
             crate::colors::yellow("Warning"), line_number + 1,
-          );
-          None
+          )
         } else {
-          Some(lines[line_number].to_string())
+          lines[line_number].to_string()
         }
       })
     } else {