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

feat: all entry_makers are now overridable and icons for builtin.buffers (#364)

Browse Source
This commit is contained in:
tamago324
2020-12-28 01:15:52 +09:00
committed by GitHub
parent 3e884e863a
commit e555cd375f
5 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lua/telescope/builtin/files.lua
View File

@@ -177,7 +177,7 @@ files.treesitter = function(opts)
prompt_title = 'Treesitter Symbols', prompt_title = 'Treesitter Symbols',
finder = finders.new_table { finder = finders.new_table {
results = results, results = results,
entry_maker = make_entry.gen_from_treesitter(opts) entry_maker = opts.entry_maker or make_entry.gen_from_treesitter(opts)
}, },
previewer = conf.grep_previewer(opts), previewer = conf.grep_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -240,7 +240,7 @@ files.tags = function(opts)
prompt = 'Tags', prompt = 'Tags',
finder = finders.new_table { finder = finders.new_table {
results = results, results = results,
entry_maker = make_entry.gen_from_ctags(opts), entry_maker = opts.entry_maker or make_entry.gen_from_ctags(opts),
}, },
previewer = previewers.ctags.new(opts), previewer = previewers.ctags.new(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),

4
lua/telescope/builtin/git.lua
View File

@@ -35,7 +35,7 @@ git.commits = function(opts)
prompt_title = 'Git Commits', prompt_title = 'Git Commits',
finder = finders.new_table { finder = finders.new_table {
results = results, results = results,
entry_maker = make_entry.gen_from_git_commits(opts), entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts),
}, },
previewer = previewers.git_commit_diff.new(opts), previewer = previewers.git_commit_diff.new(opts),
sorter = conf.file_sorter(opts), sorter = conf.file_sorter(opts),
@@ -54,7 +54,7 @@ git.bcommits = function(opts)
prompt_title = 'Git BCommits', prompt_title = 'Git BCommits',
finder = finders.new_table { finder = finders.new_table {
results = results, results = results,
entry_maker = make_entry.gen_from_git_commits(opts), entry_maker = opts.entry_maker or make_entry.gen_from_git_commits(opts),
}, },
previewer = previewers.git_commit_diff.new(opts), previewer = previewers.git_commit_diff.new(opts),
sorter = conf.file_sorter(opts), sorter = conf.file_sorter(opts),

20
lua/telescope/builtin/internal.lua
View File

@@ -198,7 +198,7 @@ internal.quickfix = function(opts)
prompt_title = 'Quickfix', prompt_title = 'Quickfix',
finder = finders.new_table { finder = finders.new_table {
results = locations, results = locations,
entry_maker = make_entry.gen_from_quickfix(opts), entry_maker = opts.entry_maker or make_entry.gen_from_quickfix(opts),
}, },
previewer = conf.qflist_previewer(opts), previewer = conf.qflist_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -221,7 +221,7 @@ internal.loclist = function(opts)
prompt_title = 'Loclist', prompt_title = 'Loclist',
finder = finders.new_table { finder = finders.new_table {
results = locations, results = locations,
entry_maker = make_entry.gen_from_quickfix(opts), entry_maker = opts.entry_maker or make_entry.gen_from_quickfix(opts),
}, },
previewer = conf.qflist_previewer(opts), previewer = conf.qflist_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -275,7 +275,7 @@ internal.vim_options = function(opts)
prompt = 'options', prompt = 'options',
finder = finders.new_table { finder = finders.new_table {
results = vim_opts, results = vim_opts,
entry_maker = make_entry.gen_from_vimoptions(opts), entry_maker = opts.entry_maker or make_entry.gen_from_vimoptions(opts),
}, },
-- TODO: previewer for Vim options -- TODO: previewer for Vim options
-- previewer = previewers.help.new(opts), -- previewer = previewers.help.new(opts),
@@ -410,7 +410,7 @@ internal.man_pages = function(opts)
prompt_title = 'Man', prompt_title = 'Man',
finder = finders.new_table { finder = finders.new_table {
results = lines, results = lines,
entry_maker = make_entry.gen_from_apropos(opts), entry_maker = opts.entry_maker or make_entry.gen_from_apropos(opts),
}, },
previewer = previewers.man.new(opts), previewer = previewers.man.new(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -452,7 +452,7 @@ internal.reloader = function(opts)
prompt_title = 'Packages', prompt_title = 'Packages',
finder = finders.new_table { finder = finders.new_table {
results = package_list, results = package_list,
entry_maker = make_entry.gen_from_packages(opts), entry_maker = opts.entry_maker or make_entry.gen_from_packages(opts),
}, },
-- previewer = previewers.vim_buffer.new(opts), -- previewer = previewers.vim_buffer.new(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -512,7 +512,7 @@ internal.buffers = function(opts)
prompt_title = 'Buffers', prompt_title = 'Buffers',
finder = finders.new_table { finder = finders.new_table {
results = buffers, results = buffers,
entry_maker = make_entry.gen_from_buffer(opts) entry_maker = opts.entry_maker or make_entry.gen_from_buffer(opts)
}, },
previewer = conf.grep_previewer(opts), previewer = conf.grep_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -554,7 +554,7 @@ internal.marks = function(opts)
prompt = 'Marks', prompt = 'Marks',
finder = finders.new_table { finder = finders.new_table {
results = marks_table, results = marks_table,
entry_maker = make_entry.gen_from_marks(opts), entry_maker = opts.entry_maker or make_entry.gen_from_marks(opts),
}, },
previewer = conf.grep_previewer(opts), previewer = conf.grep_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -578,7 +578,7 @@ internal.registers = function(opts)
prompt_title = 'Registers', prompt_title = 'Registers',
finder = finders.new_table { finder = finders.new_table {
results = registers_table, results = registers_table,
entry_maker = make_entry.gen_from_registers(opts), entry_maker = opts.entry_maker or make_entry.gen_from_registers(opts),
}, },
-- use levenshtein as n-gram doesn't support <2 char matches -- use levenshtein as n-gram doesn't support <2 char matches
sorter = sorters.get_levenshtein_sorter(), sorter = sorters.get_levenshtein_sorter(),
@@ -661,7 +661,7 @@ internal.highlights = function(opts)
prompt_title = 'Highlights', prompt_title = 'Highlights',
finder = finders.new_table { finder = finders.new_table {
results = highlights, results = highlights,
entry_maker = make_entry.gen_from_highlights(opts) entry_maker = opts.entry_maker or make_entry.gen_from_highlights(opts)
}, },
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
attach_mappings = function(prompt_bufnr) attach_mappings = function(prompt_bufnr)
@@ -751,7 +751,7 @@ internal.autocommands = function(opts)
prompt_title = 'autocommands', prompt_title = 'autocommands',
finder = finders.new_table { finder = finders.new_table {
results = autocmd_table, results = autocmd_table,
entry_maker = make_entry.gen_from_autocommands(opts), entry_maker = opts.entry_maker or make_entry.gen_from_autocommands(opts),
}, },
previewer = previewers.autocommands.new(opts), previewer = previewers.autocommands.new(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),

6
lua/telescope/builtin/lsp.lua
View File

@@ -30,7 +30,7 @@ lsp.references = function(opts)
prompt_title = 'LSP References', prompt_title = 'LSP References',
finder = finders.new_table { finder = finders.new_table {
results = locations, results = locations,
entry_maker = make_entry.gen_from_quickfix(opts), entry_maker = opts.entry_maker or make_entry.gen_from_quickfix(opts),
}, },
previewer = conf.qflist_previewer(opts), previewer = conf.qflist_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -60,7 +60,7 @@ lsp.document_symbols = function(opts)
prompt_title = 'LSP Document Symbols', prompt_title = 'LSP Document Symbols',
finder = finders.new_table { finder = finders.new_table {
results = locations, results = locations,
entry_maker = make_entry.gen_from_lsp_symbols(opts) entry_maker = opts.entry_maker or make_entry.gen_from_lsp_symbols(opts)
}, },
previewer = conf.qflist_previewer(opts), previewer = conf.qflist_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),
@@ -174,7 +174,7 @@ lsp.workspace_symbols = function(opts)
prompt_title = 'LSP Workspace Symbols', prompt_title = 'LSP Workspace Symbols',
finder = finders.new_table { finder = finders.new_table {
results = locations, results = locations,
entry_maker = make_entry.gen_from_lsp_symbols(opts) entry_maker = opts.entry_maker or make_entry.gen_from_lsp_symbols(opts)
}, },
previewer = conf.qflist_previewer(opts), previewer = conf.qflist_previewer(opts),
sorter = conf.generic_sorter(opts), sorter = conf.generic_sorter(opts),

29
lua/telescope/make_entry.lua
View File

@@ -33,6 +33,7 @@ local lsp_type_highlight = {
local make_entry = {} local make_entry = {}
local transform_devicons local transform_devicons
local get_devicons
if has_devicons then if has_devicons then
if not devicons.has_loaded() then if not devicons.has_loaded() then
devicons.setup() devicons.setup()
@@ -52,10 +53,27 @@ if has_devicons then
return icon_display return icon_display
end end
end end
get_devicons = function(filename, disable_devicons)
if disable_devicons or not filename then
return ''
end
local icon, icon_highlight = devicons.get_icon(filename, string.match(filename, '%a+$'), { default = true })
if conf.color_devicons then
return icon, icon_highlight
else
return icon
end
end
else else
transform_devicons = function(_, display, _) transform_devicons = function(_, display, _)
return display return display
end end
get_devicons = function(_, _)
return ''
end
end end
do do
@@ -426,11 +444,19 @@ end
function make_entry.gen_from_buffer(opts) function make_entry.gen_from_buffer(opts)
opts = opts or {} opts = opts or {}
local disable_devicons = opts.disable_devicons
local icon_width = 0
if not disable_devicons then
icon_width = vim.fn.strdisplaywidth(get_devicons('fname', disable_devicons))
end
local displayer = entry_display.create { local displayer = entry_display.create {
separator = " ", separator = " ",
items = { items = {
{ width = opts.bufnr_width }, { width = opts.bufnr_width },
{ width = 4 }, { width = 4 },
{ width = icon_width },
{ remaining = true }, { remaining = true },
}, },
} }
@@ -445,9 +471,12 @@ function make_entry.gen_from_buffer(opts)
display_bufname = entry.filename display_bufname = entry.filename
end end
local icon, hl_group = get_devicons(entry.filename, disable_devicons)
return displayer { return displayer {
{entry.bufnr, "TelescopeResultsNumber"}, {entry.bufnr, "TelescopeResultsNumber"},
{entry.indicator, "TelescopeResultsComment"}, {entry.indicator, "TelescopeResultsComment"},
{ icon, hl_group },
display_bufname .. ":" .. entry.lnum display_bufname .. ":" .. entry.lnum
} }
end end