neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: make mru file position lookup synchronous

Browse source
This commit is contained in:
CJ van den Berg 2025-02-22 22:12:21 +01:00
parent 5f7b28db5f
commit 2a76da6cf6
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Project.zig
View file

@ -418,8 +418,7 @@ fn update_mru_internal(self: *Self, file_path: []const u8, mtime: i128, row: usi
pub fn get_mru_position(self: *Self, from: tp.pid_ref, file_path: []const u8) ClientError!void { pub fn get_mru_position(self: *Self, from: tp.pid_ref, file_path: []const u8) ClientError!void {
for (self.files.items) |*file| { for (self.files.items) |*file| {
if (!std.mem.eql(u8, file.path, file_path)) continue; if (!std.mem.eql(u8, file.path, file_path)) continue;
if (file.row != 0) from.send(.{ file.pos.row, file.pos.col }) catch return error.ClientFailed;
from.send(.{ "cmd", "goto_line_and_column", .{ file.row + 1, file.col + 1 } }) catch return error.ClientFailed;
return; return;
} }
} }

11
src/project_manager.zig
View file

@ -16,6 +16,8 @@ const Self = @This();
const module_name = @typeName(Self); const module_name = @typeName(Self);
const request_timeout = std.time.ns_per_s * 5; const request_timeout = std.time.ns_per_s * 5;
pub const FilePos = Project.FilePos;
pub const Error = ProjectError || ProjectManagerError; pub const Error = ProjectError || ProjectManagerError;
pub const ProjectError = error{NoProject}; pub const ProjectError = error{NoProject};
@ -226,11 +228,16 @@ pub fn update_mru(file_path: []const u8, row: usize, col: usize, ephemeral: bool
return send(.{ "update_mru", project, file_path, row, col }); return send(.{ "update_mru", project, file_path, row, col });
} }
pub fn get_mru_position(file_path: []const u8) (ProjectManagerError || ProjectError)!void { pub fn get_mru_position(allocator: std.mem.Allocator, file_path: []const u8) (ProjectManagerError || ProjectError || CallError || cbor.Error)!?Project.FilePos {
const frame = tracy.initZone(@src(), .{ .name = "get_mru_position" });
defer frame.deinit();
const project = tp.env.get().str("project"); const project = tp.env.get().str("project");
if (project.len == 0) if (project.len == 0)
return error.NoProject; return error.NoProject;
return send(.{ "get_mru_position", project, file_path }); const rsp = try (try get()).pid.call(allocator, request_timeout, .{ "get_mru_position", project, file_path });
defer allocator.free(rsp.buf);
var pos: Project.FilePos = undefined;
return if (try cbor.match(rsp.buf, .{ tp.extract(&pos.row), tp.extract(&pos.col) })) pos else null;
} }
const Process = struct { const Process = struct {

9
src/tui/mainview.zig
View file

@ -359,6 +359,12 @@ const cmds = struct {
const same_file = if (self.get_active_file_path()) |fp| std.mem.eql(u8, fp, f) else false; const same_file = if (self.get_active_file_path()) |fp| std.mem.eql(u8, fp, f) else false;
const have_editor_metadata = if (self.buffer_manager.get_buffer_for_file(f)) |_| true else false; const have_editor_metadata = if (self.buffer_manager.get_buffer_for_file(f)) |_| true else false;
if (!same_file and !have_editor_metadata)
if (try project_manager.get_mru_position(self.allocator, f)) |pos| {
line = @intCast(pos.row);
column = @intCast(pos.col);
};
if (!same_file) { if (!same_file) {
if (self.get_active_editor()) |editor| { if (self.get_active_editor()) |editor| {
editor.send_editor_jump_source() catch {}; editor.send_editor_jump_source() catch {};
@ -374,9 +380,6 @@ const cmds = struct {
try command.executeName("scroll_view_center", .{}); try command.executeName("scroll_view_center", .{});
if (column) |col| if (column) |col|
try command.executeName("goto_column", command.fmt(.{col})); try command.executeName("goto_column", command.fmt(.{col}));
} else {
if (!same_file and !have_editor_metadata)
try project_manager.get_mru_position(f);
} }
tui.need_render(); tui.need_render();
} }