From 28640633bef57fd4aab9f82ad215e075f59e9e23 Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Sun, 18 Aug 2024 13:59:53 +0200
Subject: [PATCH] refactor: move add_diagnostics command from editor to
 mainview

---
 src/tui/editor.zig   | 29 +++++++++------------------
 src/tui/mainview.zig | 47 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/tui/editor.zig b/src/tui/editor.zig
index 4f37dca..4ee46da 100644
--- a/src/tui/editor.zig
+++ b/src/tui/editor.zig
@@ -3455,25 +3455,15 @@ pub const Editor = struct {
         self.need_render();
     }
 
-    pub fn add_diagnostic(self: *Self, ctx: Context) Result {
-        var file_path: []const u8 = undefined;
-        var source: []const u8 = undefined;
-        var code: []const u8 = undefined;
-        var message: []const u8 = undefined;
-        var severity: i32 = 0;
-        var sel: Selection = .{};
-        if (!try ctx.args.match(.{
-            tp.extract(&file_path),
-            tp.extract(&source),
-            tp.extract(&code),
-            tp.extract(&message),
-            tp.extract(&severity),
-            tp.extract(&sel.begin.row),
-            tp.extract(&sel.begin.col),
-            tp.extract(&sel.end.row),
-            tp.extract(&sel.end.col),
-        })) return error.InvalidArgument;
-        file_path = project_manager.normalize_file_path(file_path);
+    pub fn add_diagnostic(
+        self: *Self,
+        file_path: []const u8,
+        source: []const u8,
+        code: []const u8,
+        message: []const u8,
+        severity: i32,
+        sel: Selection,
+    ) Result {
         if (!std.mem.eql(u8, file_path, self.file_path orelse return)) return;
 
         (try self.diagnostics.addOne()).* = .{
@@ -3491,7 +3481,6 @@ pub const Editor = struct {
             .Hint => self.diag_hints += 1,
         }
         self.send_editor_diagnostics() catch {};
-        // self.logger.print("diag: {d} {d} {d}:{d} {s}", .{ self.diagnostics.items.len, severity, sel.begin.row, sel.begin.col, message });
         self.need_render();
     }
 
diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig
index 8a7d40f..3de63a3 100644
--- a/src/tui/mainview.zig
+++ b/src/tui/mainview.zig
@@ -105,18 +105,6 @@ pub fn receive(self: *Self, from_: tp.pid_ref, m: tp.message) error{Exit}!bool {
     return if (try self.floating_views.send(from_, m)) true else self.widgets.send(from_, m);
 }
 
-fn add_find_in_files_result(self: *Self, path: []const u8, begin_line: usize, begin_pos: usize, end_line: usize, end_pos: usize, lines: []const u8) tp.result {
-    const filelist_view = @import("filelist_view.zig");
-    if (!self.is_panel_view_showing(filelist_view))
-        _ = self.toggle_panel_view(filelist_view, false) catch |e| return tp.exit_error(e, @errorReturnTrace());
-    const fl = self.get_panel_view(filelist_view) orelse @panic("filelist_view missing");
-    if (self.find_in_files_done) {
-        self.find_in_files_done = false;
-        fl.reset();
-    }
-    fl.add_item(.{ .path = path, .begin_line = @max(1, begin_line) - 1, .begin_pos = @max(1, begin_pos) - 1, .end_line = @max(1, end_line) - 1, .end_pos = @max(1, end_pos) - 1, .lines = lines }) catch |e| return tp.exit_error(e, @errorReturnTrace());
-}
-
 pub fn update(self: *Self) void {
     self.widgets.update();
     self.floating_views.update();
@@ -405,6 +393,29 @@ const cmds = struct {
             try command.executeName("goto_prev_diagnostic", ctx);
         }
     }
+
+    pub fn add_diagnostic(self: *Self, ctx: Ctx) Result {
+        var file_path: []const u8 = undefined;
+        var source: []const u8 = undefined;
+        var code: []const u8 = undefined;
+        var message: []const u8 = undefined;
+        var severity: i32 = 0;
+        var sel: ed.Selection = .{};
+        if (!try ctx.args.match(.{
+            tp.extract(&file_path),
+            tp.extract(&source),
+            tp.extract(&code),
+            tp.extract(&message),
+            tp.extract(&severity),
+            tp.extract(&sel.begin.row),
+            tp.extract(&sel.begin.col),
+            tp.extract(&sel.end.row),
+            tp.extract(&sel.end.col),
+        })) return error.InvalidArgument;
+        file_path = project_manager.normalize_file_path(file_path);
+        if (self.editor) |editor| if (std.mem.eql(u8, file_path, editor.file_path orelse ""))
+            try editor.add_diagnostic(file_path, source, code, message, severity, sel);
+    }
 };
 
 pub fn handle_editor_event(self: *Self, _: tp.pid_ref, m: tp.message) tp.result {
@@ -585,3 +596,15 @@ fn pop_file_stack(self: *Self, closed: ?[]const u8) ?[]const u8 {
                 self.a.free(self.file_stack.orderedRemove(i));
     return self.file_stack.popOrNull();
 }
+
+fn add_find_in_files_result(self: *Self, path: []const u8, begin_line: usize, begin_pos: usize, end_line: usize, end_pos: usize, lines: []const u8) tp.result {
+    const filelist_view = @import("filelist_view.zig");
+    if (!self.is_panel_view_showing(filelist_view))
+        _ = self.toggle_panel_view(filelist_view, false) catch |e| return tp.exit_error(e, @errorReturnTrace());
+    const fl = self.get_panel_view(filelist_view) orelse @panic("filelist_view missing");
+    if (self.find_in_files_done) {
+        self.find_in_files_done = false;
+        fl.reset();
+    }
+    fl.add_item(.{ .path = path, .begin_line = @max(1, begin_line) - 1, .begin_pos = @max(1, begin_pos) - 1, .end_line = @max(1, end_line) - 1, .end_pos = @max(1, end_pos) - 1, .lines = lines }) catch |e| return tp.exit_error(e, @errorReturnTrace());
+}