Skip to content

fix(cmdline): preserve range prefix when applying text edits #1155

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

Closed
wants to merge 2 commits into from
Closed

fix(cmdline): preserve range prefix when applying text edits #1155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
485c6d9
fix: fixed range prefix removal
solidtesting Feb 5, 2025
c239a9c
fix: preserve special characters
solidtesting Feb 6, 2025
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
32 changes: 26 additions & 6 deletions lua/blink/cmp/sources/cmdline/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,17 @@ function cmdline:get_completions(context, callback)
:schedule()
:map(function(completions)
local items = {}

-- Helper function: find the longest match for a given set of patterns
local function longest_match(str, patterns)
local best = ''
for _, pat in ipairs(patterns) do
local m = str:match(pat)
if m and #m > #best then best = m end
end
return best
end

for _, completion in ipairs(completions) do
local has_prefix = string.find(completion, current_arg_prefix, 1, true) == 1

Expand All @@ -90,20 +101,29 @@ function cmdline:get_completions(context, callback)
local new_text = completion
if not has_prefix and cmd == 'lua' then new_text = current_arg_prefix .. completion end

local prefix = longest_match(current_arg, {
"^%s*'<%s*,%s*'>%s*", -- Visual range, e.g., '<,>'
'^%s*%d+%s*,%s*%d+%s*', -- Numeric range, e.g., 3,5
'^%s*[%p]+%s*', -- One or more punctuation characters
})

local prefix_length = #prefix
local start_pos = #text_before_argument + prefix_length
local cmdpos = vim.fn.getcmdpos() - 1

table.insert(items, {
label = label,
filterText = filter_text,
-- move items starting with special characters to the end of the list
sortText = label:lower():gsub('^([!-@\\[-`])', '~%1'),
textEdit = {
newText = new_text,
newText = (current_arg:sub(1, prefix_length) == prefix) and new_text or (prefix .. new_text),
insert = {
start = { line = 0, character = #text_before_argument },
['end'] = { line = 0, character = math.min(#text_before_argument + #current_arg, vim.fn.getcmdpos() - 1) },
start = { line = 0, character = start_pos },
['end'] = { line = 0, character = cmdpos },
},
replace = {
start = { line = 0, character = #text_before_argument },
['end'] = { line = 0, character = #text_before_argument + #current_arg },
start = { line = 0, character = start_pos },
['end'] = { line = 0, character = start_pos + #current_arg },
},
},
kind = require('blink.cmp.types').CompletionItemKind.Property,
Expand Down
Loading