From 3ea2ad6cae6211d1ab7c85a79c1c8ba7dcf55556 Mon Sep 17 00:00:00 2001
From: He Li <li@imlihe.com>
Date: Thu, 30 Nov 2023 02:57:57 +0800
Subject: [PATCH] Don't exit watcher on invalid utf-8 (#2795)

---
 crates/typst-cli/src/compile.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/crates/typst-cli/src/compile.rs b/crates/typst-cli/src/compile.rs
index 731159248..3397935b6 100644
--- a/crates/typst-cli/src/compile.rs
+++ b/crates/typst-cli/src/compile.rs
@@ -6,7 +6,7 @@ use codespan_reporting::diagnostic::{Diagnostic, Label};
 use codespan_reporting::term::{self, termcolor};
 use ecow::eco_format;
 use termcolor::{ColorChoice, StandardStream};
-use typst::diag::{bail, Severity, SourceDiagnostic, StrResult};
+use typst::diag::{bail, At, Severity, SourceDiagnostic, StrResult};
 use typst::eval::Tracer;
 use typst::foundations::Datetime;
 use typst::model::Document;
@@ -78,8 +78,20 @@ pub fn compile_once(
         Status::Compiling.print(command).unwrap();
     }
 
-    // Ensure that the main file is present.
-    world.source(world.main()).map_err(|err| err.to_string())?;
+    // Check if main file can be read and opened.
+    if let Err(errors) = world.source(world.main()).at(Span::detached()) {
+        set_failed();
+        tracing::info!("Failed to open and decode main file");
+
+        if watching {
+            Status::Error.print(command).unwrap();
+        }
+
+        print_diagnostics(world, &errors, &[], command.common.diagnostic_format)
+            .map_err(|err| eco_format!("failed to print diagnostics ({err})"))?;
+
+        return Ok(());
+    }
 
     let mut tracer = Tracer::new();
     let result = typst::compile(world, &mut tracer);