Compare commits

..

No commits in common. "0b28218a98ab25d665544042b743ad1f413a5172" and "eb72f06be18cdebe7a37155c4e5dea7ae6d4e46e" have entirely different histories.

2 changed files with 6 additions and 9 deletions

View file

@ -11,7 +11,6 @@
["ctrl+w", "quit"],
["ctrl+o", "open_file"],
["ctrl+e", "open_recent"],
["alt+o", "open_previous_file"],
["ctrl+shift+f5", "reload_file"],
["ctrl+k ctrl+t", "change_theme"],
["ctrl+shift+p", "open_command_palette"],
@ -130,6 +129,7 @@
["ctrl+shift+kp_left", "select_word_left"],
["ctrl+shift+kp_right", "select_word_right"],
["ctrl+shift+space", "selections_reverse"],
["alt+o", "open_previous_file"],
["alt+j", "join_next_line"],
["alt+n", "goto_next_file_or_diagnostic"],
["alt+p", "goto_prev_file_or_diagnostic"],

View file

@ -1002,7 +1002,7 @@ const cmds = struct {
pub const show_diagnostics_meta: Meta = .{ .description = "Show diagnostics panel" };
pub fn open_previous_file(self: *Self, _: Ctx) Result {
self.show_file_async(self.get_next_mru_buffer(.all) orelse return error.Stop);
self.show_file_async(self.get_next_mru_buffer() orelse return error.Stop);
}
pub const open_previous_file_meta: Meta = .{ .description = "Open the previous file" };
@ -1228,7 +1228,7 @@ pub fn handle_editor_event(self: *Self, _: tp.pid_ref, m: tp.message) tp.result
return self.location_update(m);
if (try m.match(.{ "E", "close" })) {
if (self.get_next_mru_buffer(.non_hidden)) |file_path|
if (self.get_next_mru_buffer()) |file_path|
self.show_file_async(file_path)
else
self.show_home_async();
@ -1498,18 +1498,15 @@ fn send_buffer_did_open(allocator: std.mem.Allocator, buffer: *Buffer) !void {
);
}
fn get_next_mru_buffer(self: *Self, mode: enum { all, hidden, non_hidden }) ?[]const u8 {
fn get_next_mru_buffer(self: *Self) ?[]const u8 {
const buffers = self.buffer_manager.list_most_recently_used(self.allocator) catch return null;
defer self.allocator.free(buffers);
const active_file_path = self.get_active_file_path();
for (buffers) |buffer| {
if (active_file_path) |fp| if (std.mem.eql(u8, fp, buffer.get_file_path()))
continue;
if (switch (mode) {
.all => false,
.hidden => !buffer.hidden,
.non_hidden => buffer.hidden,
}) continue;
if (buffer.hidden)
continue;
return buffer.get_file_path();
}
return null;