Integrate the fix for Ariadne's ordering problem

Author: Enrico Granata

Cargo.lock

@@ -9,7 +9,7 @@ parser-lib = { path = "../parser-lib" }
 compiler-lib = { path = "../compiler-lib" }
 vm-lib = { path = "../vm-lib" }
 clap = { version = "4.5.50", features = ["derive"] }
-ariadne = { version = "0.5.0", features = ["auto-color"] }
+ariadne = { git = "https://github.com/zesterer/ariadne.git", rev="b60b500" }
 reedline = "0.43.0"
 
 [[bin]]

aria-bin/Cargo.toml

@@ -56,14 +56,15 @@ fn build_report_from_msg_and_location<'a>(
     .with_message(msg)
     .with_config(config);
     let mut cache = StringCache::default();
-    for loc in &locations {
+    for (idx, loc) in locations.iter().enumerate() {
         let loc = loc.clone();
         report = report.with_label(
             Label::new((
                 loc.buffer.name.clone(),
                 loc.location.start..loc.location.stop,
             ))
             .with_message("here")
+            .with_order(idx as i32)
             .with_color(magenta),
         );
         if !cache.buffers.contains_key(&loc.buffer.name) {

aria-bin/src/error_reporting.rs

@@ -0,0 +1,3 @@
+main.aria:6:9
+util.aria:3:13
+main.aria:6:9

aria-bin/src/error_reporting_test/expected.txt

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0
+import foo from util;
+
+func op(x,y) {
+    if x > 0 {
+        throw "x is positive :(";
+    }
+    return y + x;
+}
+
+func main() {
+    # this is reported as 6:9 (the location of the throw, not the location of the call)
+    # which is a bug, but I need to fix that orthogonally to this test
+    foo(op,3);
+}

aria-bin/src/error_reporting_test/main.aria

@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+func foo(f, n) {
+    return f(3,n);
+}

aria-bin/src/error_reporting_test/util.aria

@@ -21,6 +21,20 @@ if [ $EXIT_CODE -ne 42 ]; then
     exit 1
 fi
 
+ERROR_REPORTING_TEMPLATE="$SELF_DIR"/aria-bin/src/error_reporting_test/expected.txt
+ERROR_REPORTING_OUTPUT=$(ARIA_LIB_DIR_EXTRA="$SELF_DIR"/aria-bin/src/error_reporting_test \
+          ARIA_LIB_DIR="$ARIA_LIB_DIR" \
+          cargo run --profile "$ARIA_BUILD_CONFIG" \
+          --package aria-bin -- \
+          "$SELF_DIR"/aria-bin/src/error_reporting_test/main.aria 2>&1)
+echo "$ERROR_REPORTING_OUTPUT" | awk '
+  match($0, /\/[^[:space:]]+:[0-9]+:[0-9]+/) {
+    path = substr($0, RSTART, RLENGTH)
+    n = split(path, parts, "/")
+    print parts[n]
+  }
+' | diff -u "$ERROR_REPORTING_TEMPLATE" - && echo "OK" || { echo "Mismatch - actual output ${ERROR_REPORTING_OUTPUT}"; exit 1; }
+
 ARIA_TEST_DIR="$ARIA_TEST_DIR" \
 ARIA_LIB_DIR="$ARIA_LIB_DIR" \
 RUST_MIN_STACK="$RUST_MIN_STACK" \

t

@@ -4,7 +4,7 @@ version = "0.9.20251013"
 edition = "2024"
 
 [dependencies]
-ariadne = { version = "0.5.0", features = ["auto-color"] }
+ariadne = { git = "https://github.com/zesterer/ariadne.git", rev="b60b500" }
 clap = { version = "4.5.50", features = ["derive"] }
 glob = "0.3.3"
 rayon = "1.11.0"