Merge pull request #7949 from roc-lang/expected-snapshots

Tests for snapshots using EXPECTED

Author: rtfeldman

build.zig

@@ -17,6 +17,7 @@ pub fn build(b: *std.Build) void {
     const fmt_step = b.step("fmt", "Format all zig code");
     const check_fmt_step = b.step("check-fmt", "Check formatting of all zig code");
     const snapshot_step = b.step("snapshot", "Run the snapshot tool to update snapshot files");
+    const update_expected_step = b.step("update-expected", "Update EXPECTED sections based on PROBLEMS in snapshots");
 
     // general configuration
     const target = b.standardTargetOptions(.{ .default_target = .{
@@ -75,6 +76,17 @@ pub fn build(b: *std.Build) void {
     add_tracy(b, build_options, snapshot_exe, target, false, tracy);
     install_and_run(b, no_bin, snapshot_exe, snapshot_step, snapshot_step);
 
+    // Add update-expected tool
+    const update_expected_exe = b.addExecutable(.{
+        .name = "update-expected",
+        .root_source_file = b.path("src/update_expected.zig"),
+        .target = target,
+        .optimize = optimize,
+        .link_libc = true,
+    });
+    add_tracy(b, build_options, update_expected_exe, target, false, tracy);
+    install_and_run(b, no_bin, update_expected_exe, update_expected_step, update_expected_step);
+
     const all_tests = b.addTest(.{
         .root_source_file = b.path("src/test.zig"),
         .target = target,

src/check/canonicalize.zig

@@ -2947,6 +2947,7 @@ test {
     _ = @import("canonicalize/test/int_test.zig");
     _ = @import("canonicalize/test/frac_test.zig");
     _ = @import("canonicalize/test/node_store_test.zig");
+    _ = @import("let_polymorphism_integration_test.zig");
 }
 
 /// Flatten a chain of if-then-else expressions into multiple if-branches

src/check/canonicalize/CIR.zig

@@ -174,9 +174,12 @@ pub fn diagnosticToReport(self: *CIR, diagnostic: Diagnostic, allocator: std.mem
         },
         .ident_not_in_scope => |data| blk: {
             const ident_name = self.env.idents.getText(data.ident);
+            const region_info = self.calcRegionInfo(data.region);
             break :blk Diagnostic.buildIdentNotInScopeReport(
                 allocator,
                 ident_name,
+                region_info,
+                filename,
             );
         },
         .invalid_top_level_statement => |data| blk: {

src/check/canonicalize/Diagnostic.zig

@@ -214,7 +214,12 @@ pub const Diagnostic = union(enum) {
     }
 
     /// Build a report for "identifier not in scope" diagnostic
-    pub fn buildIdentNotInScopeReport(allocator: Allocator, ident_name: []const u8) !Report {
+    pub fn buildIdentNotInScopeReport(
+        allocator: Allocator,
+        ident_name: []const u8,
+        region_info: base.RegionInfo,
+        filename: []const u8,
+    ) !Report {
         var report = Report.init(allocator, "UNDEFINED VARIABLE", .runtime_error);
         const owned_ident = try report.addOwnedString(ident_name);
         try report.document.addText("Nothing is named ");
@@ -226,6 +231,13 @@ pub const Diagnostic = union(enum) {
         try report.document.addText(" or ");
         try report.document.addKeyword("exposing");
         try report.document.addReflowingText(" missing up-top?");
+        try report.document.addLineBreak();
+        try report.document.addLineBreak();
+        try report.document.addSourceRegion(
+            region_info,
+            .error_highlight,
+            filename,
+        );
         return report;
     }