Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(actions.move): correctly rename open (dir) buffers #336

Merged
merged 3 commits into from
Nov 16, 2023
Merged

fix(actions.move): correctly rename open (dir) buffers #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb8d54e
fix(actions): correctly rename open (dir) buffers
fdschmidt93 Nov 15, 2023
689ad6d
docs(actions): document order sensitivity of moving
fdschmidt93 Nov 15, 2023
af9197e
[docgen] Update doc/telescope-file-browser.txt
Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion doc/telescope-file-browser.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,12 @@ fb_actions.rename({prompt_bufnr}) *telescope-file-browser.actions.rename()*
fb_actions.move({prompt_bufnr}) *telescope-file-browser.actions.move()*
Move multi-selected files or folders to current directory in
|telescope-file-browser.picker.file_browser|.
Note: Performs a blocking synchronized file-system operation.

- Notes:
- Performs a blocking synchronized file-system operation.
- Moving multi-selections is sensitive to order of selection, which
potentially unpacks files from parent(s) dirs if files are selected
first.


Parameters: ~
Expand Down
26 changes: 19 additions & 7 deletions lua/telescope/_extensions/file_browser/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,11 @@ fb_actions.rename = function(prompt_bufnr)
end

--- Move multi-selected files or folders to current directory in |telescope-file-browser.picker.file_browser|.<br>
--- Note: Performs a blocking synchronized file-system operation.
--- - Notes:
--- - Performs a blocking synchronized file-system operation.
--- - Moving multi-selections is sensitive to order of selection,
--- which potentially unpacks files from parent(s) dirs
--- if files are selected first.
---@param prompt_bufnr number: The prompt bufnr
fb_actions.move = function(prompt_bufnr)
local current_picker = action_state.get_current_picker(prompt_bufnr)
Expand All @@ -342,17 +346,25 @@ fb_actions.move = function(prompt_bufnr)
local skipped = {}

for idx, selection in ipairs(selections) do
local filename = selection.filename:sub(#selection:parent().filename + 2)
local new_path = Path:new { target_dir, filename }
-- use vim.fs rather than plenary to fetch basename, more battle-tested
local old_path_absolute = selection:absolute()
local basename = vim.fs.basename(old_path_absolute)
local new_path = Path:new { target_dir, basename }
if new_path:exists() then
table.insert(skipped, filename)
table.insert(skipped, basename)
else
local new_path_absolute = new_path:absolute()
selection:rename {
new_name = new_path.filename,
new_name = new_path_absolute,
}
table.insert(moved, filename)
if not selection:is_dir() then
fb_utils.rename_buf(old_path_absolute, new_path_absolute)
else
fb_utils.rename_dir_buf(old_path_absolute, new_path_absolute)
end
table.insert(moved, basename)
if idx == 1 and #selections == 1 then
fb_utils.selection_callback(current_picker, new_path:absolute())
fb_utils.selection_callback(current_picker, new_path_absolute)
end
end
end
Expand Down