feat(pickers): fully customizable layout

nvim-telescope · Aug 30, 2023 · 6b7c798 · 6b7c798
1 parent 32e6792
commit 6b7c798
Show file tree

Hide file tree

Showing 13 changed files with 390 additions and 202 deletions.
diff --git a/lua/telescope/actions/generate.lua b/lua/telescope/actions/generate.lua
@@ -75,12 +75,12 @@ action_generate.refine = function(prompt_bufnr, opts)
   end
 
   -- title
-  if opts.prompt_title and current_picker.prompt_border then
-    current_picker.prompt_border:change_title(opts.prompt_title)
+  if opts.prompt_title and current_picker.layout.prompt.border then
+    current_picker.layout.prompt.border:change_title(opts.prompt_title)
   end
 
-  if opts.results_title and current_picker.results_border then
-    current_picker.results_border:change_title(opts.results_title)
+  if opts.results_title and current_picker.layout.results.border then
+    current_picker.layout.results.border:change_title(opts.results_title)
   end
 
   local results = {}

diff --git a/lua/telescope/actions/layout.lua b/lua/telescope/actions/layout.lua
@@ -26,10 +26,10 @@ action_layout.toggle_preview = function(prompt_bufnr)
   local picker = action_state.get_current_picker(prompt_bufnr)
   local status = state.get_status(picker.prompt_bufnr)
 
-  if picker.previewer and status.preview_win then
+  if picker.previewer and status.layout.preview.winid then
     picker.hidden_previewer = picker.previewer
     picker.previewer = nil
-  elseif picker.hidden_previewer and not status.preview_win then
+  elseif picker.hidden_previewer and not status.layout.preview.winid then
     picker.previewer = picker.hidden_previewer
     picker.hidden_previewer = nil
   else

diff --git a/lua/telescope/actions/set.lua b/lua/telescope/actions/set.lua
@@ -231,11 +231,11 @@ action_set.scroll_previewer = function(prompt_bufnr, direction)
   local status = state.get_status(prompt_bufnr)
 
   -- Check if we actually have a previewer and a preview window
-  if type(previewer) ~= "table" or previewer.scroll_fn == nil or status.preview_win == nil then
+  if type(previewer) ~= "table" or previewer.scroll_fn == nil or status.layout.preview.winid == nil then
     return
   end
 
-  local default_speed = vim.api.nvim_win_get_height(status.preview_win) / 2
+  local default_speed = vim.api.nvim_win_get_height(status.layaout.preview.winid) / 2
   local speed = status.picker.layout_config.scroll_speed or default_speed
 
   previewer:scroll_fn(math.floor(speed * direction))
@@ -270,12 +270,12 @@ end
 --      Valid directions include: "1", "-1"
 action_set.scroll_results = function(prompt_bufnr, direction)
   local status = state.get_status(prompt_bufnr)
-  local default_speed = vim.api.nvim_win_get_height(status.results_win) / 2
+  local default_speed = vim.api.nvim_win_get_height(status.layout.results.winid) / 2
   local speed = status.picker.layout_config.scroll_speed or default_speed
 
   local input = direction > 0 and [[]] or [[]]
 
-  vim.api.nvim_win_call(status.results_win, function()
+  vim.api.nvim_win_call(status.layout.results.winid, function()
     vim.cmd([[normal! ]] .. math.floor(speed) .. input)
   end)
 

diff --git a/lua/telescope/builtin/__internal.lua b/lua/telescope/builtin/__internal.lua
@@ -978,8 +978,8 @@ internal.colorscheme = function(opts)
         preview_fn = function(_, entry, status)
           if not deleted then
             deleted = true
-            del_win(status.preview_win)
-            del_win(status.preview_border_win)
+            del_win(status.layout.preview.winid)
+            del_win(status.layout.preview.border.winid)
           end
           vim.cmd("colorscheme " .. entry.value)
         end,

diff --git a/lua/telescope/config.lua b/lua/telescope/config.lua
@@ -188,6 +188,16 @@ append(
   Default: 'horizontal']]
 )
 
+append(
+  "create_layout",
+  nil,
+  [[
+  Configure the layout of Telescope pickers.
+  See |telescope.layout| for details.
+
+  Default: 'nil']]
+)
+
 append("layout_config", layout_config_defaults, layout_config_description)
 
 append(