Skip to content

fix(blink.cmp): avoid duplicate characters #128

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

Draft
One-In-Dark wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(blink.cmp): avoid duplicate characters #128

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
35 changes: 29 additions & 6 deletions lua/fittencode/sources/blink/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,38 @@ local blink = {}
-- https://github.com/hrsh7th/nvim-cmp/pull/2002
---@param suggestions string[]
---@return lsp.CompletionResponse?
local function convert_to_lsp_completion_response(line, character, suggestions)
local function convert_to_lsp_completion_response(context, suggestions)
local LABEL_LIMIT = 80
local text = character .. table.concat(suggestions, '\n')
local first = character .. suggestions[1]
local label = (#first > LABEL_LIMIT or #suggestions > 1) and string.sub(first, 1, LABEL_LIMIT - 3) .. '...' or first
local line = context.line
local bounds = context.bounds or {}
local base_cursor = {Base.get_cursor()}
local fallback_col = (base_cursor[2] or 0) + 1 -- fallback to cursor col (1-based)
local start_col = (bounds.start_col or fallback_col) - 1 -- Lua 1-based to 0-based for LSP
local end_col = (bounds.end_col or fallback_col) - 1
local row
if context.row then
row = context.row - 1
else
row = base_cursor[1] or 0
end
local text = suggestions[1]
local label = (#text > LABEL_LIMIT or #suggestions > 1) and string.sub(text, 1, LABEL_LIMIT - 3) .. '...' or text


local items = {}
table.insert(items, {
kind = 'FittenCode',
label = label,
insertTextFormat = vim.lsp.protocol.InsertTextFormat.PlainText,
insertText = text,
description = '```' .. vim.bo.ft .. '\n' .. text .. '\n```',
textEdit = {
newText = text,
range = {
start = { line = row, character = start_col },
['end'] = { line = row, character = end_col }
}
}
})
return { items = items, is_incomplete_forward = false, is_incomplete_backward = false }
end
Expand All @@ -47,15 +67,18 @@ function blink:get_completions(context, callback)
return
end
local line = context.line
local character = line:sub(context.bounds.start_col, context.bounds.end_col)
local bounds = context.bounds or {}
local base_cursor = {Base.get_cursor()}
local fallback_col = (base_cursor[2] or 0) + 1
local character = line:sub(bounds.start_col or fallback_col, bounds.end_col or fallback_col)
-- local info = {
-- triggerCharacter = context.trigger.character,
-- line = line,
-- character = character,
-- -- reason = request.option.reason,
-- }
-- Log.debug('Source(blink) request: {}', info)
local response = convert_to_lsp_completion_response(line, character, suggestions)
local response = convert_to_lsp_completion_response(context, suggestions)
-- Log.debug('LSP CompletionResponse: {}', response)
callback(response)
-- callback()
Expand Down