Skip to content

Make dismiss a noop when Copilot isn't visible #192

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

Merged
MunifTanjim merged 2 commits into from
Jun 29, 2023
Merged

Make dismiss a noop when Copilot isn't visible #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06de1aa
Make dismiss a noop when not visible
MariaSolOs Jun 29, 2023
74ee4c8
Update lua/copilot/suggestion.lua
MariaSolOs Jun 29, 2023
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
16 changes: 11 additions & 5 deletions lua/copilot/suggestion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,16 @@ local function set_keymap(keymap)
end

if keymap.dismiss then
vim.keymap.set("i", keymap.dismiss, mod.dismiss, {
vim.keymap.set("i", keymap.dismiss, function()
if mod.is_visible() then
mod.dismiss()
return "<Ignore>"
else
return keymap.dismiss
end
end, {
desc = "[copilot] dismiss suggestion",
expr = true,
silent = true,
Comment thread
MariaSolOs marked this conversation as resolved.
})
end
Expand Down Expand Up @@ -215,10 +223,8 @@ local function update_preview()

local cursor_col = vim.fn.col(".")

displayLines[1] = string.sub(
string.sub(suggestion.text, 1, (string.find(suggestion.text, "\n", 1, true) or 0) - 1),
cursor_col
)
displayLines[1] =
string.sub(string.sub(suggestion.text, 1, (string.find(suggestion.text, "\n", 1, true) or 0) - 1), cursor_col)

local extmark = {
id = copilot.extmark_id,
Expand Down