diff --git a/lua/nvim-tree/actions/fs/copy-paste.lua b/lua/nvim-tree/actions/fs/copy-paste.lua index 6c339dc00ae..1b26ef12678 100644 --- a/lua/nvim-tree/actions/fs/copy-paste.lua +++ b/lua/nvim-tree/actions/fs/copy-paste.lua @@ -110,12 +110,12 @@ local function do_single_paste(source, dest, action_type, action_fn) end) else local prompt_select = "Overwrite " .. dest .. " ?" - local prompt_input = prompt_select .. " y/n/r(ename): " - lib.prompt(prompt_input, prompt_select, { "y", "n", "r" }, { "Yes", "No", "Rename" }, function(item_short) + local prompt_input = prompt_select .. " R(ename)/y/n: " + lib.prompt(prompt_input, prompt_select, { "", "y", "n" }, { "Rename", "Yes", "No" }, function(item_short) utils.clear_prompt() if item_short == "y" then on_process() - elseif item_short == "r" then + elseif item_short == "" or item_short == "r" then vim.ui.input({ prompt = "Rename to ", default = dest, completion = "dir" }, function(new_dest) utils.clear_prompt() if new_dest then diff --git a/lua/nvim-tree/actions/fs/remove-file.lua b/lua/nvim-tree/actions/fs/remove-file.lua index d29bd21c4ae..abc94d4f091 100644 --- a/lua/nvim-tree/actions/fs/remove-file.lua +++ b/lua/nvim-tree/actions/fs/remove-file.lua @@ -107,8 +107,8 @@ function M.fn(node) if M.config.ui.confirm.remove then local prompt_select = "Remove " .. node.name .. " ?" - local prompt_input = prompt_select .. " y/n: " - lib.prompt(prompt_input, prompt_select, { "y", "n" }, { "Yes", "No" }, function(item_short) + local prompt_input = prompt_select .. " y/N: " + lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, function(item_short) utils.clear_prompt() if item_short == "y" then do_remove() diff --git a/lua/nvim-tree/actions/fs/trash.lua b/lua/nvim-tree/actions/fs/trash.lua index 00124108ef7..1db48a20c2a 100644 --- a/lua/nvim-tree/actions/fs/trash.lua +++ b/lua/nvim-tree/actions/fs/trash.lua @@ -83,8 +83,8 @@ function M.fn(node) if M.config.ui.confirm.trash then local prompt_select = "Trash " .. node.name .. " ?" - local prompt_input = prompt_select .. " y/n: " - lib.prompt(prompt_input, prompt_select, { "y", "n" }, { "Yes", "No" }, function(item_short) + local prompt_input = prompt_select .. " y/N: " + lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, function(item_short) utils.clear_prompt() if item_short == "y" then do_trash() diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua index 622bf8dbd36..66ab0ed5188 100644 --- a/lua/nvim-tree/lib.lua +++ b/lua/nvim-tree/lib.lua @@ -148,7 +148,9 @@ function M.prompt(prompt_input, prompt_select, items_short, items_long, callback end) else vim.ui.input({ prompt = prompt_input, default = items_short[1] or "" }, function(item_short) - callback(item_short and item_short:sub(1, 1) or nil) + if item_short then + callback(string.lower(item_short and item_short:sub(1, 1)) or nil) + end end) end end diff --git a/lua/nvim-tree/marks/bulk-delete.lua b/lua/nvim-tree/marks/bulk-delete.lua index 3dd38ea96e4..7a9cb5a0597 100644 --- a/lua/nvim-tree/marks/bulk-delete.lua +++ b/lua/nvim-tree/marks/bulk-delete.lua @@ -32,8 +32,8 @@ function M.bulk_delete() if M.config.ui.confirm.remove then local prompt_select = "Remove bookmarked ?" - local prompt_input = prompt_select .. " y/n: " - lib.prompt(prompt_input, prompt_select, { "y", "n" }, { "Yes", "No" }, function(item_short) + local prompt_input = prompt_select .. " y/N: " + lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, function(item_short) utils.clear_prompt() if item_short == "y" then do_delete(nodes)