(WIP) Use ariadne

Cargo.toml

@@ -19,6 +19,7 @@ members = [".", "crates/*"]
 
 [dependencies]
 ansi_term = "0.12.0"
+ariadne = "0.4.1"
 blake3 = { version = "1.5.0", features = ["rayon", "mmap"] }
 camino = "1.0.4"
 chrono = "0.4.38"

justfile

@@ -12,7 +12,7 @@ export JUST_LOG := log
 watch +args='test':
   cargo watch --clear --exec '{{ args }}'
 
-[group: 'test']
+[group('test')]
 test:
   cargo test --all
 

src/compile_error.rs

@@ -19,6 +19,62 @@ impl<'src> CompileError<'src> {
   }
 }
 
+pub(crate) fn render_compile_error(error: &CompileError, color: Color) {
+  use ariadne::{Config, Label, Report, ReportKind, Source};
+
+  let token = error.token;
+  let source = Source::from(token.src);
+
+  let start = token.offset;
+  let end = token.offset + token.length;
+
+  let path = format!("{}", token.path.display());
+  let label = Label::new((&path, start..end));
+
+  let config = Config::default().with_color(color.stderr().active());
+  let report = Report::build(ReportKind::Error, &path, start).with_config(config);
+
+  let report = match &*error.kind {
+    CompileErrorKind::AttributeArgumentCountMismatch {
+      attribute,
+      found,
+      min,
+      max,
+    } => {
+      let label_msg = format!("Found {found} {}", Count("argument", *found));
+
+      let note = if min == max {
+        format!("`{attribute}` takes {min} {}", Count("argument", *min))
+      } else {
+        format!("`{attribute}` takes between {min} and {max} arguments")
+      };
+
+      report
+        .with_message("Attribute argument count mismatch")
+        .with_label(label.with_message(label_msg))
+        .with_note(note)
+        .finish()
+    }
+    CompileErrorKind::DuplicateAttribute { attribute, first } => {
+      let original_label = source
+        .line(*first)
+        .map(|line| Label::new((&path, line.span())).with_message("original"));
+
+      let mut report = report.with_message(format!("Duplicate attribute `{attribute}`"));
+      if let Some(original) = original_label {
+        report = report.with_label(original);
+      }
+      report.with_label(label.with_message("duplicate")).finish()
+    }
+    _ => {
+      let message = format!("{error}");
+      report.with_message(message).with_label(label).finish()
+    }
+  };
+
+  report.eprint((&path, source)).unwrap();
+}
+
 fn capitalize(s: &str) -> String {
   let mut chars = s.chars();
   match chars.next() {

src/error.rs

@@ -504,6 +504,13 @@ impl ColorDisplay for Error<'_> {
   }
 }
 
+pub(crate) fn render_error(error: &Error, color: Color) {
+  match error {
+    Error::Compile { compile_error } => compile_error::render_compile_error(compile_error, color),
+    _ => eprintln!("{}", error.color_display(color.stderr())),
+  }
+}
+
 fn format_cmd(binary: &OsString, arguments: &Vec<OsString>) -> String {
   iter::once(binary)
     .chain(arguments)

src/run.rs

@@ -29,7 +29,7 @@ pub fn run(args: impl Iterator<Item = impl Into<OsString> + Clone>) -> Result<()
     })
     .map_err(|error| {
       if !verbosity.quiet() && error.print_message() {
-        eprintln!("{}", error.color_display(color.stderr()));
+        crate::error::render_error(&error, color);
       }
       error.code().unwrap_or(EXIT_FAILURE)
     })

tests/string.rs

@@ -184,12 +184,12 @@ test! {
   args:     ("a"),
   stdout:   "",
   stderr:   "
-    error: Unterminated string
-     ——▶ justfile:1:6
-      │
-    1 │ a b= ':
-      │      ^
-  ",
+Error: Unterminated string
+   ╭─[justfile:1:6]
+   │
+ 1 │ a b= ':
+───╯
+",
   status:   EXIT_FAILURE,
 }
 
@@ -201,12 +201,12 @@ test! {
   args:     ("a"),
   stdout:   "",
   stderr:   r#"
-    error: Unterminated string
-     ——▶ justfile:1:6
-      │
-    1 │ a b= ":
-      │      ^
-  "#,
+Error: Unterminated string
+   ╭─[justfile:1:6]
+   │
+ 1 │ a b= ":
+───╯
+"#,
   status:   EXIT_FAILURE,
 }
 
@@ -234,11 +234,11 @@ test! {
   args:     ("a"),
   stdout:   "",
   stderr:   "
-    error: Unterminated string
-     ——▶ justfile:1:6
-      │
-    1 │ a b= ''':
-      │      ^^^
+Error: Unterminated string
+   ╭─[justfile:1:6]
+   │
+ 1 │ a b= ''':
+───╯
   ",
   status:   EXIT_FAILURE,
 }
@@ -251,11 +251,11 @@ test! {
   args:     ("a"),
   stdout:   "",
   stderr:   r#"
-    error: Unterminated string
-     ——▶ justfile:1:6
-      │
-    1 │ a b= """:
-      │      ^^^
+Error: Unterminated string
+   ╭─[justfile:1:6]
+   │
+ 1 │ a b= """:
+───╯
   "#,
   status:   EXIT_FAILURE,
 }
@@ -481,11 +481,11 @@ fn unicode_escape_non_hex() {
     .status(1)
     .stderr(
       r#"
-error: expected hex digit [0-9A-Fa-f] but found `o`
- ——▶ justfile:1:6
-  │
-1 │ x := "\u{foo}"
-  │      ^^^^^^^^^
+Error: expected hex digit [0-9A-Fa-f] but found `o`
+   ╭─[justfile:1:6]
+   │
+ 1 │ x := "\u{foo}"
+───╯
 "#,
     )
     .run();
@@ -517,11 +517,11 @@ fn unicode_escape_too_long() {
     .status(1)
     .stderr(
       r#"
-error: unicode escape sequence starting with `\u{FFFFFFF` longer than six hex digits
- ——▶ justfile:1:6
-  │
-1 │ x := "\u{FFFFFFFFFF}"
-  │      ^^^^^^^^^^^^^^^^
+Error: unicode escape sequence starting with `\u{FFFFFFF` longer than six hex digits
+   ╭─[justfile:1:6]
+   │
+ 1 │ x := "\u{FFFFFFFFFF}"
+───╯
 "#,
     )
     .run();

tests/subsequents.rs

@@ -45,13 +45,13 @@ test! {
   justfile: "
     foo: && foo
   ",
-  stderr: "
-    error: Recipe `foo` depends on itself
-     ——▶ justfile:1:9
-      │
-    1 │ foo: && foo
-      │         ^^^
-  ",
+  stderr:
+"Error: Recipe `foo` depends on itself
+   ╭─[justfile:1:9]
+   │
+ 1 │ foo: && foo
+───╯
+",
   status: EXIT_FAILURE,
 }
 

tests/test.rs

@@ -228,7 +228,8 @@ impl Test {
     fn compare_string(name: &str, have: &str, want: &str) -> bool {
       let equal = have == want;
       if !equal {
-        eprintln!("Bad {name}: {}", StrComparison::new(&have, &want));
+        //eprintln!("Bad {name}: {}", StrComparison::new(&have, &want));
+        eprintln!("Bad {name}:\n{}||\n-------------\n{}||\n=========", &have, &want);
       }
       equal
     }

tests/working_directory.rs

@@ -381,12 +381,12 @@ fn attribute_with_nocd_is_forbidden() {
     )
     .stderr(
       "
-        error: Recipe `bar` has both `[no-cd]` and `[working-directory]` attributes
-         ——▶ justfile:3:1
-          │
-        3 │ bar:
-          │ ^^^
-      ",
+Error: Recipe `bar` has both `[no-cd]` and `[working-directory]` attributes
+   ╭─[justfile:3:1]
+   │
+ 3 │ bar:
+───╯
+"
     )
     .status(EXIT_FAILURE)
     .run();