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

feat: Use colors from nvim-devicons

Browse Source
This commit is contained in:
TJ DeVries
2020-10-24 22:55:45 -04:00
parent 7eda4e80f9
commit a8e7807086
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lua/telescope/make_entry.lua
View File

@@ -14,9 +14,10 @@ if has_devicons then
return display
end
local icon_display = (devicons.get_icon(filename, string.match(filename, '%a+$')) or ' ') .. ' ' .. display
local icon, icon_highlight = devicons.get_icon(filename, string.match(filename, '%a+$'), { default = true })
local icon_display = (icon or ' ') .. ' ' .. display
return icon_display
return icon_display, icon_highlight
end
else
transform_devicons = function(_, display, _)
@@ -66,12 +67,18 @@ do
mt_file_entry.cwd = cwd
mt_file_entry.display = function(entry)
local display = entry.value
local display, hl_group = entry.value, nil
if shorten_path then
display = utils.path_shorten(display)
end
return transform_devicons(entry.value, display, disable_devicons)
display, hl_group = transform_devicons(entry.value, display, disable_devicons)
if hl_group then
return display, { { {1, 3}, hl_group } }
else
return display
end
end
mt_file_entry.__index = function(t, k)
@@ -151,7 +158,7 @@ do
mt_vimgrep_entry.cwd = vim.fn.expand(opts.cwd or vim.fn.getcwd())
mt_vimgrep_entry.display = function(entry)
local display = entry.value
local display, hl_group = entry.value, nil
local display_filename
if shorten_path then
@@ -165,14 +172,18 @@ do
coordinates = string.format("%s:%s:", entry.lnum, entry.col)
end
display = transform_devicons(
display, hl_group = transform_devicons(
entry.filename,
string.format(display_string, display_filename, coordinates, entry.text),
disable_devicons
)
if hl_group then
return display, { { {1, 3}, hl_group } }
else
return display
end
end
mt_vimgrep_entry.__index = function(t, k)
local raw = rawget(mt_vimgrep_entry, k)

17
lua/telescope/pickers.lua
View File

@@ -37,6 +37,7 @@ local extend = function(opts, defaults)
end
local ns_telescope_selection = a.nvim_create_namespace('telescope_selection')
local ns_telescope_entry = a.nvim_create_namespace('telescope_entry')
local ns_telescope_matching = a.nvim_create_namespace('telescope_matching')
local ns_telescope_prompt = a.nvim_create_namespace('telescope_prompt')
local ns_telescope_prompt_prefix = a.nvim_create_namespace('telescope_prompt_prefix')
@@ -772,10 +773,10 @@ function Picker:entry_adder(index, entry, score)
return
end
local display
local display, display_highlights
if type(entry.display) == 'function' then
self:_increment("display_fn")
display = entry:display()
display, display_highlights = entry:display()
elseif type(entry.display) == 'string' then
display = entry.display
else
@@ -786,11 +787,8 @@ function Picker:entry_adder(index, entry, score)
-- This is the two spaces to manage the '> ' stuff.
-- Maybe someday we can use extmarks or floaty text or something to draw this and not insert here.
-- until then, insert two spaces
if TELESCOPE_DEBUG then
display = ' ' .. score .. display
else
display = ' ' .. display
end
local prefix = TELESCOPE_DEBUG and (' ' .. score) or ' '
display = prefix .. display
self:_increment("displayed")
@@ -803,6 +801,11 @@ function Picker:entry_adder(index, entry, score)
local set_ok = pcall(vim.api.nvim_buf_set_lines, self.results_bufnr, row, row + 1, false, {display})
if set_ok and display_highlights then
for _, hl_block in ipairs(display_highlights) do
a.nvim_buf_add_highlight(self.results_bufnr, ns_telescope_entry, hl_block[2], row, #prefix + hl_block[1][1], #prefix + hl_block[1][2])
end
end
-- This pretty much only fails when people leave newlines in their results.
-- So we'll clean it up for them if it fails.