Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion lua/fff/picker_ui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -466,20 +466,22 @@ end
--- Setup window options
function M.setup_windows()
local hl = M.state.config.hl

local win_hl = string.format('Normal:%s,FloatBorder:%s,FloatTitle:%s', hl.normal, hl.border, hl.title)
vim.api.nvim_win_set_option(M.state.input_win, 'wrap', false)
vim.api.nvim_win_set_option(M.state.input_win, 'cursorline', false)
vim.api.nvim_win_set_option(M.state.input_win, 'number', false)
vim.api.nvim_win_set_option(M.state.input_win, 'relativenumber', false)
vim.api.nvim_win_set_option(M.state.input_win, 'signcolumn', 'no')
vim.api.nvim_win_set_option(M.state.input_win, 'foldcolumn', '0')
vim.api.nvim_win_set_option(M.state.input_win, 'winhighlight', win_hl)

vim.api.nvim_win_set_option(M.state.list_win, 'wrap', false)
vim.api.nvim_win_set_option(M.state.list_win, 'cursorline', false)
vim.api.nvim_win_set_option(M.state.list_win, 'number', false)
vim.api.nvim_win_set_option(M.state.list_win, 'relativenumber', false)
vim.api.nvim_win_set_option(M.state.list_win, 'signcolumn', 'yes:1') -- Enable signcolumn for git status borders
vim.api.nvim_win_set_option(M.state.list_win, 'foldcolumn', '0')
vim.api.nvim_win_set_option(M.state.list_win, 'winhighlight', win_hl)

if M.enabled_preview() then
vim.api.nvim_win_set_option(M.state.preview_win, 'wrap', false)
Expand All @@ -488,6 +490,7 @@ function M.setup_windows()
vim.api.nvim_win_set_option(M.state.preview_win, 'relativenumber', false)
vim.api.nvim_win_set_option(M.state.preview_win, 'signcolumn', 'no')
vim.api.nvim_win_set_option(M.state.preview_win, 'foldcolumn', '0')
vim.api.nvim_win_set_option(M.state.preview_win, 'winhighlight', win_hl)
end
end

Expand Down Expand Up @@ -958,6 +961,18 @@ function M.render_list()
priority = 1000,
})
end

local match_start, match_end = string.find(line_content, M.state.query, 1)
if match_start and match_end then
vim.api.nvim_buf_add_highlight(
M.state.list_buf,
M.state.ns_id,
config.hl.matched or 'IncSearch',
line_idx - 1,
match_start - 1,
match_end
)
end
end
end
end
Expand Down
Loading