fix(wgsl-in): print debug repr. of unexpected tokens

erichdongubler-mozilla · Jan 13, 2025 · 237a94a · 237a94a
1 parent 2088645
commit 237a94a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/naga/src/front/wgsl/error.rs b/naga/src/front/wgsl/error.rs
@@ -409,7 +409,7 @@ impl<'a> Error<'a> {
                 };
                 ParseError {
                     message: format!(
-                        "expected {}, found '{}'",
+                        "expected {}, found {:?}",
                         expected_str, &source[unexpected_span],
                     ),
                     labels: vec![(unexpected_span, format!("expected {expected_str}").into())],

diff --git a/naga/tests/wgsl_errors.rs b/naga/tests/wgsl_errors.rs
@@ -2432,3 +2432,17 @@ fn const_assert_failed() {
 "###,
     );
 }
+
+#[test]
+fn reject_utf8_bom() {
+    check(
+        "\u{FEFF}fn main() {}",
+        r#"error: expected global item ('struct', 'const', 'var', 'alias', 'fn', 'diagnostic', 'enable', 'requires', ';') or the end of the file, found "\u{feff}"
+  ┌─ wgsl:1:1
+  │
+1 │ fn main() {}
+  │  expected global item ('struct', 'const', 'var', 'alias', 'fn', 'diagnostic', 'enable', 'requires', ';') or the end of the file
+
+"#,
+    );
+}