From 2352631a2f219c2e405929e9f1e515e8591591c1 Mon Sep 17 00:00:00 2001 From: Will Hopkins Date: Tue, 3 Oct 2023 23:56:32 -0700 Subject: [PATCH] refactor!: don't delete buffer when falling back to history --- lua/cokeline/mappings.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/cokeline/mappings.lua b/lua/cokeline/mappings.lua index ed0d558..d08c9e9 100644 --- a/lua/cokeline/mappings.lua +++ b/lua/cokeline/mappings.lua @@ -43,7 +43,7 @@ local by_index = function(goal, index) end end ----@param goal '"switch"' | '"focus"' |'"close"' | fun(buf: Buffer) +---@param goal '"switch"' | '"focus"' |'"close"' | fun(buf: Buffer, did_fallback: boolean) ---@param step -1 | 1 local by_step = function(goal, step) local config = lazy("cokeline.config") @@ -53,6 +53,7 @@ local by_step = function(goal, step) local target_buf local target_idx + local did_fallback = false if focused_buffer then target_idx = focused_buffer._valid_index + step if target_idx < 1 or target_idx > #state.valid_buffers then @@ -63,6 +64,7 @@ local by_step = function(goal, step) end target_buf = state.valid_buffers[target_idx] elseif goal == "focus" and config.history.enabled then + did_fallback = true target_buf = require("cokeline.history"):last() if step < -1 then -- The result of history:last() is the index -1, @@ -84,10 +86,10 @@ local by_step = function(goal, step) buffers.move_buffer(focused_buffer, target_idx) elseif goal == "focus" then target_buf:focus() - elseif goal == "close" then + elseif goal == "close" and not did_fallback then target_buf:delete() elseif type(goal) == "function" then - goal(target_buf) + goal(target_buf, did_fallback) end end end