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

fix(picker): prevent status text from hiding prompt (#2936)

Browse Source 
There's a limitation with extmark's `right_align` virtual text and how
it handles side scrolling. This causes text entered to be hidden behind
the virtual text rather than begin the side scroll.

An issue is opened upstream https://github.com/neovim/neovim/issues/27540

But this could take a while before it's fixed as it's considered
`complexity:high`.

This PR adds a temporary workaround of just hiding the status text if the
prompt is long enough to interfere with it.
This commit is contained in:
James Trew
2024-02-23 20:10:33 -05:00
committed by GitHub
parent 12e42a3625
commit fa81a4b133
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lua/telescope/config.lua
View File

@@ -367,23 +367,40 @@ append(
append( append(
"get_status_text", "get_status_text",
function(self, opts) function(self, opts)
local ww = #(self:get_multi_selection()) local multi_select_cnt = #(self:get_multi_selection())
local xx = (self.stats.processed or 0) - (self.stats.filtered or 0) local showing_cnt = (self.stats.processed or 0) - (self.stats.filtered or 0)
local yy = self.stats.processed or 0 local total_cnt = self.stats.processed or 0
local status_icon = "" local status_icon = ""
local status_text
if opts and not opts.completed then if opts and not opts.completed then
status_icon = "*" status_icon = "*"
end end
if xx == 0 and yy == 0 then if showing_cnt == 0 and total_cnt == 0 then
return status_icon status_text = status_icon
elseif multi_select_cnt == 0 then
status_text = string.format("%s %s / %s", status_icon, showing_cnt, total_cnt)
else
status_text = string.format("%s %s / %s / %s", status_icon, multi_select_cnt, showing_cnt, total_cnt)
end end
if ww == 0 then -- quick workaround for extmark right_align side-scrolling limitation
return string.format("%s %s / %s", status_icon, xx, yy) -- https://github.com/nvim-telescope/telescope.nvim/issues/2929
local prompt_width = vim.api.nvim_win_get_width(self.prompt_win)
local cursor_col = vim.api.nvim_win_get_cursor(self.prompt_win)[2]
local prefix_display_width = strings.strdisplaywidth(self.prompt_prefix) --[[@as integer]]
local prefix_width = #self.prompt_prefix
local prefix_shift = 0
if prefix_display_width ~= prefix_width then
prefix_shift = prefix_display_width
end
local cursor_occluded = (prompt_width - cursor_col - #status_text + prefix_shift) < 0
if cursor_occluded then
return ""
else else
return string.format("%s %s / %s / %s", status_icon, ww, xx, yy) return status_text
end end
end, end,
[[ [[