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

Handle completion of % and # completion correctly. #83

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Handle completion of % and # completion correctly. #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
691b37f
Handle completion of % and # completion correctly.
iteratee Feb 25, 2023
7e31674
Add back the `fixed_input` detection
iteratee Apr 24, 2024
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
41 changes: 40 additions & 1 deletion lua/cmp_cmdline/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ local definitions = {
isIncomplete = true,
---@param option cmp-cmdline.Option
exec = function(option, arglead, cmdline, force)
-- Any edits we produce are relative to the whole command line.
local cmdline_length = #cmdline
-- Ignore range only cmdline. (e.g.: 4, '<,'>)
if not force and ONLY_RANGE_REGEX:match_str(cmdline) then
return {}
Expand Down Expand Up @@ -133,6 +135,13 @@ local definitions = {
--- create items.
local items = {}
local escaped = cmdline:gsub([[\\]], [[\\\\]]);
local is_magic_file = false
local input_start = string.sub(fixed_input, 1, 1)
if input_start == '%' then
is_magic_file = true
elseif input_start == '#' then
is_magic_file = true
end
for _, word_or_item in ipairs(vim.fn.getcompletion(escaped, 'cmdline')) do
local word = type(word_or_item) == 'string' and word_or_item or word_or_item.word
local item = { label = word }
Expand All @@ -147,9 +156,25 @@ local definitions = {

-- fix label with `fixed_input`
for _, item in ipairs(items) do
if not string.find(item.label, fixed_input, 1, true) then
if not is_magic_file and not string.find(item.label, fixed_input, 1, true) then
item.label = fixed_input .. item.label
end
if is_magic_file then
local replace_range = {
start = {
character = cmdline_length - #arglead - 1
},
['end'] = {
character = cmdline_length - 1
}
}
item.textEdit = {
replace = replace_range,
range = replace_range,
newText = item.label
}
item.label = arglead .. ' → ' .. item.label
end
end

-- fix trailing slash for path like item
Expand Down Expand Up @@ -217,6 +242,20 @@ source.complete = function(self, params, callback)
for _, item in ipairs(items) do
item.kind = kind
labels[item.label] = true
if item['textEdit'] ~= nil then
local new_range = {
start = {
character = item.textEdit.range.start.character,
line = params.context.cursor.line
},
['end'] = {
character = item.textEdit.range['end'].character,
line = params.context.cursor.line
}
}
item.textEdit.replace = new_range
item.textEdit.range = new_range
end
end

-- `vim.fn.getcompletion` does not handle fuzzy matches. So, we must return all items, including items that were matched in the previous input.
Expand Down