Skip to content

Commit 935b1dc

Browse files
committed
Align telescope highlights with fzf
Signed-off-by: Aaron Hallaert <[email protected]>
1 parent 4438ca9 commit 935b1dc

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

lua/advanced_git_search/telescope/finders/utils.lua

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
local utils = require("advanced_git_search.utils")
2+
local entry_display = require("telescope.pickers.entry_display")
23

34
local M = {}
45
local last_prompt = nil
@@ -15,18 +16,39 @@ M.git_log_entry_maker = function(entry)
1516
local hash = attrs[1]
1617
local date = attrs[2]
1718
local author = attrs[3]
19+
for i = 4, #attrs do
20+
author = author .. " " .. attrs[i]
21+
end
22+
1823
-- join split from second element
1924
local message = split[2]
2025
if #split > 2 then
2126
for i = 3, #split do
22-
message = message .. "_" .. split[i]
27+
message = message .. " " .. split[i]
2328
end
2429
end
2530

31+
local displayer = entry_display.create({
32+
separator = " ",
33+
items = {
34+
{ width = 7 },
35+
{ width = 7 },
36+
{ remaining = true },
37+
},
38+
})
39+
40+
local make_display = function(display_entry)
41+
return displayer({
42+
{ display_entry.opts.commit_hash, "TelescopeResultsIdentifier" },
43+
{ display_entry.opts.author, "TelescopeResultsVariable" },
44+
{ display_entry.opts.message, "TelescopeResultsConstant" },
45+
})
46+
end
47+
2648
return {
2749
value = entry,
28-
display = date .. " by " .. author .. " --" .. message,
29-
-- display = hash .. " @ " .. date .. " by " .. author .. " --" .. message,
50+
-- display = date .. " by " .. author .. " --" .. message,
51+
display = make_display,
3052
ordinal = author .. " " .. message,
3153
preview_title = hash .. " -- " .. message,
3254
opts = {

lua/advanced_git_search/telescope/pickers/init.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ M.search_log_content_file = function()
139139
bufnr = vim.fn.bufnr(),
140140
}),
141141
previewer = telescope_ags_previewers.git_diff_content_previewer(),
142-
-- sorter = sorters.highlighter_only(),
143142
attach_mappings = function(_, map)
144143
telescope_ags_mappings.open_diff_view_current_file_selected_commit(
145144
map

0 commit comments

Comments
 (0)