Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(menu): prefer north direction if ghost_text is multiline #963

Closed
wants to merge 1 commit into from
Closed

feat(menu): prefer north direction if ghost_text is multiline #963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions lua/blink/cmp/completion/windows/menu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
--- @field renderer blink.cmp.Renderer
--- @field selected_item_idx? number
--- @field context blink.cmp.Context?
--- @field north boolean
--- @field open_emitter blink.cmp.EventEmitter<{}>
--- @field close_emitter blink.cmp.EventEmitter<{}>
--- @field position_update_emitter blink.cmp.EventEmitter<{}>
Expand Down Expand Up @@ -49,6 +50,7 @@ vim.api.nvim_create_autocmd({ 'CursorMovedI', 'WinScrolled', 'WinResized' }, {
function menu.open_with_items(context, items)
menu.context = context
menu.items = items
menu.north = false
menu.selected_item_idx = menu.selected_item_idx ~= nil and math.min(menu.selected_item_idx, #items) or nil

if not menu.renderer then menu.renderer = require('blink.cmp.completion.windows.render').new(config.draw) end
Expand Down Expand Up @@ -76,7 +78,7 @@ end
function menu.close()
menu.auto_show = config.auto_show
if not menu.win:is_open() then return end

menu.selected_item_idx = nil
menu.win:close()
menu.close_emitter:emit()
end
Expand All @@ -97,15 +99,30 @@ function menu.update_position()

win:update_size()

local item = menu.items[menu.selected_item_idx]
local prefer_north = false
-- If there are multiline text and user turns on ghost text, we should prefer opening upwards.
-- Once we go up, we don't go down again even if the text is only one line, to reduce visual interference
-- when keeps holding down <c-p>/<c-n>.
if
require('blink.cmp.config').completion.ghost_text.enabled and menu.north
or (item ~= nil and item.insertText ~= nil and string.find(item.insertText, '\n') ~= nil)
then
prefer_north = true
end

local border_size = win:get_border_size()
local pos = win:get_vertical_direction_and_height(config.direction_priority)
local pos = win:get_vertical_direction_and_height(prefer_north and { 'n', 's' } or config.direction_priority)

-- couldn't find anywhere to place the window
if not pos then
win:close()
return
end

-- record it, reset to false at next time when item changes
if prefer_north and pos.direction == 'n' then menu.north = true end

local alignment_start_col = menu.renderer:get_alignment_start_col()

-- place the window at the start col of the current text we're fuzzy matching against
Expand Down
Loading