separate save and remove

README.md

@@ -61,11 +61,13 @@ Just press the leader_key set on setup and follow you heart. (Is that easy)
 		edit = "e",
 		delete_mode = "d",
 		clear_all_items = "C",
-		toggle = "s",
+		toggle = "s", -- used as save if separate_save_and_remove is true
 		open_vertical = "v",
 		open_horizontal = "-",
 		quit = "q",
+    remove = "x", -- only used if separate_save_and_remove is true
   },
+  separate_save_and_remove = false, -- if true, will remove the toggle and create the save/remove keymaps.
   leader_key = ";",
   global_bookmarks = false, -- if true, arrow will save files globally (ignores separate_by_branch)
   index_keys = "123456789zxcbnmZXVBNM,afghjklAFGHJKLwrtyuiopWRTYUIOP", -- keys mapped to bookmark index, i.e. 1st bookmark will be accessible by 1, and 12th - by c

lua/arrow/init.lua

@@ -24,6 +24,7 @@ function M.setup(opts)
 		open_vertical = "v",
 		open_horizontal = "-",
 		quit = "q",
+		remove = "x",
 	}
 
 	local leader_key = opts.leader_key or ";"
@@ -34,10 +35,11 @@ function M.setup(opts)
 	config.setState("leader_key", leader_key)
 	config.setState("always_show_path", opts.always_show_path or false)
 	config.setState("show_icons", opts.show_icons)
-	config.setState("index_keys", opts.index_keys or "123456789zxcbnmZXVBNM,afghjklAFGHJKLwrtyuiopWRTYUIOP")
+	config.setState("index_keys", opts.index_keys or "123456789zcbnmZXVBNM,afghjklAFGHJKLwrtyuiopWRTYUIOP")
 	config.setState("hide_handbook", opts.hide_handbook or false)
 	config.setState("separate_by_branch", opts.separate_by_branch or false)
 	config.setState("global_bookmarks", opts.global_bookmarks or false)
+	config.setState("separate_save_and_remove", opts.separate_save_and_remove or false)
 
 	config.setState("save_key", opts.save_key or function()
 		return vim.loop.cwd()

lua/arrow/ui.lua

@@ -21,23 +21,29 @@ local function getActionsMenu()
 
 	local already_saved = current_index > 0
 
-	local text
+	local separate_save_and_remove = config.getState("separate_save_and_remove")
 
-	if already_saved == true then
-		text = string.format("%s Remove Current", mappings.toggle)
-	else
-		text = string.format("%s Save Current File", mappings.toggle)
-	end
-
-	return {
-		string.format(text, mappings.toggle),
+	local return_mappings = {
 		string.format("%s Edit Arrow File", mappings.edit),
 		string.format("%s Clear All Items", mappings.clear_all_items),
 		string.format("%s Delete mode", mappings.delete_mode),
 		string.format("%s Open Vertical", mappings.open_vertical),
 		string.format("%s Open Horizontal", mappings.open_horizontal),
 		string.format("%s Quit", mappings.quit),
 	}
+
+	if separate_save_and_remove then
+		table.insert(return_mappings, 1, string.format("%s Remove Current File", mappings.remove))
+		table.insert(return_mappings, 1, string.format("%s Save Current File", mappings.toggle))
+	else
+		if already_saved == true then
+			table.insert(return_mappings, 1, string.format("%s Remove Current File", mappings.toggle))
+		else
+			table.insert(return_mappings, 1, string.format("%s Save Current File", mappings.toggle))
+		end
+	end
+
+	return return_mappings
 end
 
 local function format_file_names(file_names)
@@ -320,6 +326,10 @@ function M.openMenu()
 
 	if show_handbook then
 		height = height + 8
+
+		if config.getState("separate_save_and_remove") then
+			height = height + 1
+		end
 	end
 
 	local width = max_width + 10
@@ -348,17 +358,37 @@ function M.openMenu()
 		border = "double",
 	})
 
+	local separate_save_and_remove = config.getState("separate_save_and_remove")
+
 	local menuKeymapOpts = { noremap = true, silent = true, buffer = menuBuf, nowait = true }
 	vim.keymap.set("n", config.getState("leader_key"), closeMenu, menuKeymapOpts)
 	vim.keymap.set("n", mappings.quit, closeMenu, menuKeymapOpts)
 	vim.keymap.set("n", mappings.edit, function()
 		closeMenu()
 		persist.open_cache_file()
 	end, menuKeymapOpts)
-	vim.keymap.set("n", mappings.toggle, function()
-		persist.toggle(filename)
-		closeMenu()
-	end, menuKeymapOpts)
+
+	if separate_save_and_remove then
+		vim.keymap.set("n", mappings.toggle, function()
+			filename = filename or utils.get_path_for("%")
+
+			persist.save(filename)
+			closeMenu()
+		end, menuKeymapOpts)
+
+		vim.keymap.set("n", mappings.remove, function()
+			filename = filename or utils.get_path_for("%")
+
+			persist.remove(filename)
+			closeMenu()
+		end, menuKeymapOpts)
+	else
+		vim.keymap.set("n", mappings.toggle, function()
+			persist.toggle(filename)
+			closeMenu()
+		end, menuKeymapOpts)
+	end
+
 	vim.keymap.set("n", mappings.clear_all_items, function()
 		persist.clear()
 		closeMenu()