leigh/telescope.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restoring picker table/function opts (#1205)

Browse Source 
* fix: missing opts for cached picker creation

* fix: make properly overridable
This commit is contained in:
fdschmidt93
2021-09-09 22:13:16 +02:00
committed by GitHub
parent 0cb1026b9e
commit 55ec6c5c9c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lua/telescope/pickers.lua
View File

@@ -84,9 +84,8 @@ function Picker:new(opts)
cwd = opts.cwd, cwd = opts.cwd,
_find_id = 0, _find_id = 0,
_completion_callbacks = {}, _completion_callbacks = type(opts._completion_callbacks) == "table" and opts._completion_callbacks or {},
manager = (type(opts.manager) == "table" and getmetatable(opts.manger) == getmetatable(EntryManager)) manager = (type(opts.manager) == "table" and getmetatable(opts.manager) == EntryManager) and opts.manager,
and opts.manager,
_multi = (type(opts._multi) == "table" and getmetatable(opts._multi) == getmetatable(MultiSelect:new())) _multi = (type(opts._multi) == "table" and getmetatable(opts._multi) == getmetatable(MultiSelect:new()))
and opts._multi and opts._multi
or MultiSelect:new(), or MultiSelect:new(),
@@ -97,6 +96,7 @@ function Picker:new(opts)
attach_mappings = opts.attach_mappings, attach_mappings = opts.attach_mappings,
file_ignore_patterns = get_default(opts.file_ignore_patterns, config.values.file_ignore_patterns), file_ignore_patterns = get_default(opts.file_ignore_patterns, config.values.file_ignore_patterns),
scroll_strategy = get_default(opts.scroll_strategy, config.values.scroll_strategy),
sorting_strategy = get_default(opts.sorting_strategy, config.values.sorting_strategy), sorting_strategy = get_default(opts.sorting_strategy, config.values.sorting_strategy),
selection_strategy = get_default(opts.selection_strategy, config.values.selection_strategy), selection_strategy = get_default(opts.selection_strategy, config.values.selection_strategy),
@@ -104,9 +104,15 @@ function Picker:new(opts)
layout_config = config.smarter_depth_2_extend(opts.layout_config or {}, config.values.layout_config or {}), layout_config = config.smarter_depth_2_extend(opts.layout_config or {}, config.values.layout_config or {}),
window = { window = {
winblend = get_default(opts.winblend, config.values.winblend), winblend = get_default(
border = get_default(opts.border, config.values.border), opts.winblend,
borderchars = get_default(opts.borderchars, config.values.borderchars), type(opts.window) == "table" and opts.window.winblend or config.values.winblend
),
border = get_default(opts.border, type(opts.window) == "table" and opts.window.border or config.values.border),
borderchars = get_default(
opts.borderchars,
type(opts.window) == "table" and opts.window.borderchars or config.values.borderchars
),
}, },
cache_picker = config.resolve_table_opts(opts.cache_picker, vim.deepcopy(config.values.cache_picker)), cache_picker = config.resolve_table_opts(opts.cache_picker, vim.deepcopy(config.values.cache_picker)),
@@ -124,10 +130,7 @@ function Picker:new(opts)
end end
-- TODO: It's annoying that this is create and everything else is "new" -- TODO: It's annoying that this is create and everything else is "new"
obj.scroller = p_scroller.create( obj.scroller = p_scroller.create(obj.scroll_strategy, obj.sorting_strategy)
get_default(opts.scroll_strategy, config.values.scroll_strategy),
obj.sorting_strategy
)
obj.highlighter = p_highlighter.new(obj) obj.highlighter = p_highlighter.new(obj)