Skip to content

Commit

Permalink
feat: add create_from_prompt option (#384)
Browse files Browse the repository at this point in the history 
* feat: add `create_from_prompt` option

Enables/disables the creation of files/folders from the prompt if no
entry is selected.
Defaults to true to preserve existing behavior.

* [docgen] Update doc/telescope-file-browser.txt
skip-checks: true

---------

Co-authored-by: Github Actions <actions@github>
  • Loading branch information
@jamestrew
jamestrew and Github Actions authored Apr 23, 2024
1 parent 5ee5002 commit 4d5fd21
Show file tree
Hide file tree
Showing 4 changed files with 132 additions and 116 deletions.
232 changes: 121 additions & 111 deletions doc/telescope-file-browser.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,81 +101,87 @@ fb_picker.file_browser({opts}) *telescope-file-browser.picker.file_browser()*
{opts} (table) options to pass to the picker

Fields: ~
{path} (string) dir to browse files from,
`vim.fn.expanded` automatically
(default: vim.loop.cwd())
{cwd} (string) dir to browse folders from,
`vim.fn.expanded` automatically
(default: vim.loop.cwd())
{cwd_to_path} (boolean) whether folder browser is
launched from `path` rather than
`cwd` (default: false)
{grouped} (boolean) group initial sorting by
directories and then files
(default: false)
{files} (boolean) start in file (true) or folder
(false) browser (default: true)
{add_dirs} (boolean) whether the file browser shows
folders (default: true)
{depth} (number) file tree depth to display,
`false` for unlimited depth
(default: 1)
{auto_depth} (boolean|number) unlimit or set `depth` to
`auto_depth` & unset grouped on
prompt for file_browser
(default: false)
{select_buffer} (boolean) select current buffer if
possible; may imply
`hidden=true` (default: false)
{hidden} (table|boolean) determines whether to show
hidden files or not (default: `{
file_browser = false,
folder_browser = false }`)
{respect_gitignore} (boolean) induces slow-down w/ plenary
finder (default: false, true if
`fd` available)
{no_ignore} (boolean) disable use of ignore files like
.gitignore/.ignore/.fdignore
(default: false, requires `fd`)
{follow_symlinks} (boolean) traverse symbolic links, i.e.
files and folders (default:
false, only works with `fd`)
{browse_files} (function) custom override for the file
browser (default:
|fb_finders.browse_files|)
{browse_folders} (function) custom override for the folder
browser (default:
|fb_finders.browse_folders|)
{hide_parent_dir} (boolean) hide `../` in the file browser
(default: false)
{collapse_dirs} (boolean) skip dirs w/ only single
(possibly hidden) sub-dir in
file_browser (default: false)
{quiet} (boolean) surpress any notification from
file_brower actions (default:
false)
{use_ui_input} (boolean) Use vim.ui.input() instead of
vim.fn.input() or
vim.fn.confirm() (default: true)
{dir_icon} (string) change the icon for a directory
(default: )
{dir_icon_hl} (string) change the highlight group of
dir icon (default: "Default")
{display_stat} (boolean|table) ordered stat; see above notes,
(default: `{ date = true, size =
true, mode = true }`)
{hijack_netrw} (boolean) use telescope file browser when
opening directory paths; must be
set on `setup` (default: false)
{use_fd} (boolean) use `fd` if available over
`plenary.scandir` (default:
true)
{git_status} (boolean) show the git status of files
(default: true if `git`
executable can be found)
{prompt_path} (boolean) Show the current relative path
from cwd as the prompt prefix.
(default: false)
{path} (string) dir to browse files from,
`vim.fn.expanded` automatically
(default: vim.loop.cwd())
{cwd} (string) dir to browse folders from,
`vim.fn.expanded` automatically
(default: vim.loop.cwd())
{cwd_to_path} (boolean) whether folder browser is
launched from `path` rather
than `cwd` (default: false)
{grouped} (boolean) group initial sorting by
directories and then files
(default: false)
{files} (boolean) start in file (true) or folder
(false) browser (default: true)
{add_dirs} (boolean) whether the file browser shows
folders (default: true)
{depth} (number) file tree depth to display,
`false` for unlimited depth
(default: 1)
{auto_depth} (boolean|number) unlimit or set `depth` to
`auto_depth` & unset grouped on
prompt for file_browser
(default: false)
{select_buffer} (boolean) select current buffer if
possible; may imply
`hidden=true` (default: false)
{hidden} (table|boolean) determines whether to show
hidden files or not (default:
`{ file_browser = false,
folder_browser = false }`)
{respect_gitignore} (boolean) induces slow-down w/ plenary
finder (default: false, true if
`fd` available)
{no_ignore} (boolean) disable use of ignore files
like
.gitignore/.ignore/.fdignore
(default: false, requires `fd`)
{follow_symlinks} (boolean) traverse symbolic links, i.e.
files and folders (default:
false, only works with `fd`)
{browse_files} (function) custom override for the file
browser (default:
|fb_finders.browse_files|)
{browse_folders} (function) custom override for the folder
browser (default:
|fb_finders.browse_folders|)
{hide_parent_dir} (boolean) hide `../` in the file browser
(default: false)
{collapse_dirs} (boolean) skip dirs w/ only single
(possibly hidden) sub-dir in
file_browser (default: false)
{quiet} (boolean) surpress any notification from
file_brower actions (default:
false)
{use_ui_input} (boolean) Use vim.ui.input() instead of
vim.fn.input() or
vim.fn.confirm() (default:
true)
{dir_icon} (string) change the icon for a directory
(default: )
{dir_icon_hl} (string) change the highlight group of
dir icon (default: "Default")
{display_stat} (boolean|table) ordered stat; see above notes,
(default: `{ date = true, size
= true, mode = true }`)
{hijack_netrw} (boolean) use telescope file browser when
opening directory paths; must
be set on `setup` (default:
false)
{use_fd} (boolean) use `fd` if available over
`plenary.scandir` (default:
true)
{git_status} (boolean) show the git status of files
(default: true if `git`
executable can be found)
{prompt_path} (boolean) Show the current relative path
from cwd as the prompt prefix.
(default: false)
{create_from_prompt} (boolean) Create file/folder from prompt
if no entry selected (default:
true)



Expand Down Expand Up @@ -460,42 +466,46 @@ fb_finders.finder({opts}) *telescope-file-browser.finders.finder()*
{opts} (table) options to pass to the picker

Fields: ~
{path} (string) root dir to file_browse from
(default: vim.loop.cwd())
{cwd} (string) root dir (default:
vim.loop.cwd())
{cwd_to_path} (boolean) folder browser follows `path` of
file browser
{files} (boolean) start in file (true) or folder
(false) browser (default: true)
{grouped} (boolean) group initial sorting by
directories and then files
(default: false)
{depth} (number) file tree depth to display
(default: 1)
{hidden} (table|boolean) determines whether to show hidden
files or not (default: `{
file_browser = false,
folder_browser = false }`)
{respect_gitignore} (boolean) induces slow-down w/ plenary
finder (default: false, true if
`fd` available)
{no_ignore} (boolean) disable use of ignore files like
.gitignore/.ignore/.fdignore
(default: false, requires `fd`)
{follow_symlinks} (boolean) traverse symbolic links, i.e.
files and folders (default:
false, only works with `fd`)
{hide_parent_dir} (boolean) hide `../` in the file browser
(default: false)
{dir_icon} (string) change the icon for a directory
(default: )
{dir_icon_hl} (string) change the highlight group of dir
icon (default: "Default")
{use_fd} (boolean) use `fd` if available over
`plenary.scandir` (default: true)
{git_status} (boolean) show the git status of files
(default: true)
{path} (string) root dir to file_browse from
(default: vim.loop.cwd())
{cwd} (string) root dir (default:
vim.loop.cwd())
{cwd_to_path} (boolean) folder browser follows `path` of
file browser
{files} (boolean) start in file (true) or folder
(false) browser (default: true)
{grouped} (boolean) group initial sorting by
directories and then files
(default: false)
{depth} (number) file tree depth to display
(default: 1)
{hidden} (table|boolean) determines whether to show
hidden files or not (default: `{
file_browser = false,
folder_browser = false }`)
{respect_gitignore} (boolean) induces slow-down w/ plenary
finder (default: false, true if
`fd` available)
{no_ignore} (boolean) disable use of ignore files like
.gitignore/.ignore/.fdignore
(default: false, requires `fd`)
{follow_symlinks} (boolean) traverse symbolic links, i.e.
files and folders (default:
false, only works with `fd`)
{hide_parent_dir} (boolean) hide `../` in the file browser
(default: false)
{dir_icon} (string) change the icon for a directory
(default: )
{dir_icon_hl} (string) change the highlight group of
dir icon (default: "Default")
{use_fd} (boolean) use `fd` if available over
`plenary.scandir` (default:
true)
{git_status} (boolean) show the git status of files
(default: true)
{create_from_prompt} (boolean) Create file/folder from prompt
if no entry selected (default:
true)



Expand Down
11 changes: 6 additions & 5 deletions lua/telescope/_extensions/file_browser/config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ _TelescopeFileBrowserConfig = {
return entry and fb_utils.is_dir(entry.Path)
end

local entry_is_nil = function(prompt_bufnr)
local prompt = action_state.get_current_picker(prompt_bufnr):_get_prompt()
local create_from_prompt = function(prompt_bufnr)
local picker = action_state.get_current_picker(prompt_bufnr)
local finder = picker.finder
local prompt = picker:_get_prompt()
local entry = action_state.get_selected_entry()

return entry == nil and #prompt > 0
return entry == nil and #prompt > 0 and finder.create_from_prompt
end

action_set.select:replace_map {
[entry_is_dir] = fb_actions.open_dir,
[entry_is_nil] = fb_actions.create_from_prompt,
[create_from_prompt] = fb_actions.create_from_prompt,
}

return true
Expand Down
3 changes: 3 additions & 0 deletions lua/telescope/_extensions/file_browser/finders.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ end
---@field dir_icon_hl string: change the highlight group of dir icon (default: "Default")
---@field use_fd boolean: use `fd` if available over `plenary.scandir` (default: true)
---@field git_status boolean: show the git status of files (default: true)
---@field create_from_prompt boolean: Create file/folder from prompt if no entry selected (default: true)
fb_finders.finder = function(opts)
opts = opts or {}
-- cache entries such that multi selections are maintained across {file, folder}_browsers
Expand Down Expand Up @@ -215,6 +216,8 @@ fb_finders.finder = function(opts)
hide_parent_dir = vim.F.if_nil(opts.hide_parent_dir, false),
collapse_dirs = vim.F.if_nil(opts.collapse_dirs, false),
git_status = vim.F.if_nil(opts.git_status, fb_git.find_root(cwd) ~= nil),
create_from_prompt = vim.F.if_nil(opts.create_from_prompt, true),

-- ensure we forward make_entry opts adequately
entry_maker = vim.F.if_nil(opts.entry_maker, function(local_opts)
return fb_make_entry(vim.tbl_extend("force", opts, local_opts))
Expand Down
2 changes: 2 additions & 0 deletions lua/telescope/_extensions/file_browser/picker.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ local fb_picker = {}
---@field use_fd boolean: use `fd` if available over `plenary.scandir` (default: true)
---@field git_status boolean: show the git status of files (default: true if `git` executable can be found)
---@field prompt_path boolean: Show the current relative path from cwd as the prompt prefix. (default: false)
---@field create_from_prompt boolean: Create file/folder from prompt if no entry selected (default: true)
fb_picker.file_browser = function(opts)
opts = opts or {}

Expand All @@ -99,6 +100,7 @@ fb_picker.file_browser = function(opts)
opts.use_fd = vim.F.if_nil(opts.use_fd, true)
opts.git_status = vim.F.if_nil(opts.git_status, vim.fn.executable "git" == 1)
opts.prompt_path = vim.F.if_nil(opts.prompt_path, false)
opts.create_from_prompt = vim.F.if_nil(opts.create_from_prompt, true)

local select_buffer = opts.select_buffer and opts.files
-- handle case that current buffer is a hidden file
Expand Down

0 comments on commit 4d5fd21

Please sign in to comment.