feat: Syntax highlight of buzz code in error reports

closes #57
buzz-language · Oct 20, 2023 · 4c160b5 · 4c160b5
1 parent c6cd264
commit 4c160b5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/node.zig b/src/node.zig
@@ -4627,8 +4627,17 @@ pub const CallNode = struct {
         if (missing_arguments.count() > 0) {
             var missing = std.ArrayList(u8).init(codegen.gc.allocator);
             const missing_writer = missing.writer();
-            for (missing_arguments.keys()) |key| {
-                try missing_writer.print("{s}, ", .{key.string});
+            for (missing_arguments.keys(), 0..) |key, i| {
+                try missing_writer.print(
+                    "{s}{s}",
+                    .{
+                        key.string,
+                        if (i < missing_arguments.keys().len - 1)
+                            ", "
+                        else
+                            "",
+                    },
+                );
             }
             defer missing.deinit();
             codegen.reporter.reportErrorFmt(

diff --git a/src/reporter.zig b/src/reporter.zig
@@ -4,6 +4,7 @@ const Token = @import("token.zig").Token;
 const o = @import("obj.zig");
 const ObjTypeDef = o.ObjTypeDef;
 const PlaceholderDef = o.PlaceholderDef;
+const Scanner = @import("scanner.zig").Scanner;
 
 const Self = @This();
 
@@ -178,6 +179,12 @@ pub const Report = struct {
     pub fn report(self: *Report, reporter: *Self, out: anytype) !void {
         assert(self.items.len > 0);
 
+        const colorterm = std.os.getenv("COLORTERM");
+        const true_color = if (colorterm) |ct|
+            std.mem.eql(u8, ct, "24bit") or std.mem.eql(u8, ct, "truecolor")
+        else
+            false;
+
         // Print main error message
         const main_item = self.items[0];
 
@@ -305,7 +312,7 @@ pub const Report = struct {
                     }
 
                     try out.print(
-                        " {: >5} {s} {s}\n\x1b[0m",
+                        " {: >5} {s} ",
                         .{
                             l + 1,
                             if (line_index == 0 and (reported_files.count() == 1 or index > 0))
@@ -314,10 +321,22 @@ pub const Report = struct {
                                 "╰─"
                             else
                                 "│ ",
-                            src_line,
                         },
                     );
 
+                    if (l == line) {
+                        var scanner = Scanner.init(
+                            reporter.allocator,
+                            "reporter",
+                            src_line,
+                        );
+                        scanner.highlight(out, true_color);
+                    } else {
+                        try out.writeAll(src_line);
+                    }
+
+                    try out.writeAll("\n\x1b[0m");
+
                     if (l == line) {
                         // Print error cursors
                         try out.print("       \x1b[2m┆ \x1b[0m ", .{});