diff --git a/lua/harpoon/init.lua b/lua/harpoon/init.lua index c5c28c8..8bcea1d 100644 --- a/lua/harpoon/init.lua +++ b/lua/harpoon/init.lua @@ -45,7 +45,7 @@ end local function merge_tables(...) local out = {} - for i = 2, select("#",...) do + for i = 1, select("#",...) do merge_table_impl(out, select(i, ...)) end return out @@ -130,7 +130,7 @@ M.setup = function(config) local complete_config = merge_tables( - {projects = {}}, + {projects = {} , global_settings = {["save_on_toggle"] = false}}, expand_dir(c_config), expand_dir(u_config), expand_dir(config)) @@ -142,6 +142,10 @@ M.setup = function(config) HarpoonConfig = complete_config end +M.get_global_settings = function() + return HarpoonConfig.global_settings +end + M.get_term_config = function() return ensure_correct_config(HarpoonConfig).projects[vim.loop.cwd()].term end @@ -160,7 +164,7 @@ M.print_config = function() end -- Sets a default config with no values -M.setup({projects = {}}) +M.setup() return M diff --git a/lua/harpoon/ui.lua b/lua/harpoon/ui.lua index eafa0c6..aa2198c 100644 --- a/lua/harpoon/ui.lua +++ b/lua/harpoon/ui.lua @@ -53,6 +53,11 @@ end M.toggle_quick_menu = function() if win_id ~= nil and vim.api.nvim_win_is_valid(win_id) then + local global_config = harpoon.get_global_settings() + print(global_config.save_on_menu_quit) + if global_config.save_on_toggle == true then + vim.cmd(":lua require('harpoon.ui').on_menu_save()") + end vim.api.nvim_win_close(win_id, true) win_id = nil