From 0830bc88a4528b11fad73740ce4ebe42e822368b Mon Sep 17 00:00:00 2001 From: Marco Kellershoff Date: Sat, 28 Sep 2024 20:30:59 +0200 Subject: [PATCH] fix(aucmd): only create session in root dir --- lua/kikao/config/aucommands.lua | 19 +++++++------------ lua/kikao/globals/init.lua | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lua/kikao/config/aucommands.lua b/lua/kikao/config/aucommands.lua index b276bed..dc9d0eb 100644 --- a/lua/kikao/config/aucommands.lua +++ b/lua/kikao/config/aucommands.lua @@ -3,19 +3,16 @@ local M = {} local save_session = false local vim_leave_cb = function(session_file_path) + if save_session == false then + return + end local sessiondir = vim.fn.fnamemodify(session_file_path, ":h") vim.fn.mkdir(sessiondir, "p") vim.cmd("mksession! " .. session_file_path) end -local vim_enter_cb = function(data, project_dir_matchers, session_file_path, ps) - local is_oil = data.file:match("^oil://") ~= nil - local is_dir = vim.fn.isdirectory(data.file) == 1 - if not is_dir and not is_oil then - return - end - - local dir = is_oil and vim.fn.getcwd() or data.file +local vim_enter_cb = function(project_dir_matchers, session_file_path, ps) + local dir = vim.fn.getcwd() for _, root in ipairs(project_dir_matchers) do if vim.fn.isdirectory(dir .. ps .. root) == 1 then @@ -29,8 +26,6 @@ local vim_enter_cb = function(data, project_dir_matchers, session_file_path, ps) vim.cmd("source " .. session_file_path) end end - - vim.cmd("bw " .. data.buf) end M.setup = function(config) @@ -44,8 +39,8 @@ M.setup = function(config) end vim.api.nvim_create_autocmd("VimEnter", { - callback = function(data) - vim_enter_cb(data, config.project_dir_matchers, session_file_path, ps) + callback = function() + vim_enter_cb(config.project_dir_matchers, session_file_path, ps) end, group = augroup, nested = true, diff --git a/lua/kikao/globals/init.lua b/lua/kikao/globals/init.lua index 43d4a18..28ea619 100644 --- a/lua/kikao/globals/init.lua +++ b/lua/kikao/globals/init.lua @@ -1,5 +1,5 @@ local M = {} -M.VERSION = "1.0.0" +M.VERSION = "1.0.1" return M