Skip to content

fix(blink): improve provider override logic and path completion handling #213

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

Open
sudo-tee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(blink): improve provider override logic and path completion handling #213

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
29 changes: 16 additions & 13 deletions lua/opencode/ui/completion/engines/blink_cmp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ end
---Check if blink-cmp is available
---@return boolean
function BlinkCmpEngine:is_available()
local ok = pcall(require, 'blink.cmp')
return ok and CompletionEngine.is_available()
return pcall(require, 'blink.cmp') and CompletionEngine.is_available()
end

---Setup blink-cmp completion engine
Expand All @@ -36,7 +35,6 @@ function BlinkCmpEngine:setup(completion_sources)
async = true,
})

-- Hide blink-cmp menu on certain trigger characters when opened via other completion sources
vim.api.nvim_create_autocmd('User', {
group = vim.api.nvim_create_augroup('OpencodeBlinkCmp', { clear = true }),
pattern = 'BlinkCmpMenuOpen',
Expand All @@ -49,10 +47,18 @@ function BlinkCmpEngine:setup(completion_sources)

local blink = require('blink.cmp')
local ctx = blink.get_context()

local triggers = CompletionEngine.get_trigger_characters()
if ctx.trigger.initial_kind == 'trigger_character' and vim.tbl_contains(triggers, ctx.trigger.character) then
blink.hide()

-- blink has a tendency to show other providers even when we want only our own.
local should_override = (
ctx.trigger.initial_kind == 'trigger_character' and vim.tbl_contains(triggers, ctx.trigger.character)
) or (ctx.trigger.initial_kind == 'keyword' and vim.tbl_contains(triggers, ctx.line:sub(1, 1)))

if should_override then
blink.show({
providers = { 'opencode_mentions' },
trigger_character = ctx.trigger.character,
})
end
end,
})
Expand All @@ -62,8 +68,8 @@ end
---Check if blink-cmp completion menu is visible
---@return boolean
function BlinkCmpEngine:is_visible()
local ok, blink = pcall(require, 'blink.cmp')
return ok and blink.is_visible()
local blink = require('blink.cmp')
return blink.is_visible()
end

---Trigger completion manually for blink-cmp
Expand All @@ -83,10 +89,7 @@ function BlinkCmpEngine:trigger(trigger_char)
end

function BlinkCmpEngine:hide()
local blink = require('blink.cmp')
if blink.is_visible() then
blink.hide()
end
require('blink.cmp').hide()
end

-- Source implementation for blink-cmp provider (when this module is loaded by blink.cmp)
Expand Down Expand Up @@ -157,7 +160,7 @@ function Source:get_completions(ctx, callback)
end)
end

function Source:execute(ctx, item, callback, default_implementation)
function Source:execute(_, item, callback, default_implementation)
default_implementation()

if item.data and item.data.original_item then
Expand Down