Skip to content

Commit 6866708

Browse files
authored
feat(suggestion): fallback to key for dismiss when not visible
1 parent 33aa941 commit 6866708

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

lua/copilot/suggestion.lua

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,16 @@ local function set_keymap(keymap)
9595
end
9696

9797
if keymap.dismiss then
98-
vim.keymap.set("i", keymap.dismiss, mod.dismiss, {
98+
vim.keymap.set("i", keymap.dismiss, function()
99+
if mod.is_visible() then
100+
mod.dismiss()
101+
return "<Ignore>"
102+
else
103+
return keymap.dismiss
104+
end
105+
end, {
99106
desc = "[copilot] dismiss suggestion",
107+
expr = true,
100108
silent = true,
101109
})
102110
end
@@ -215,10 +223,8 @@ local function update_preview()
215223

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

218-
displayLines[1] = string.sub(
219-
string.sub(suggestion.text, 1, (string.find(suggestion.text, "\n", 1, true) or 0) - 1),
220-
cursor_col
221-
)
226+
displayLines[1] =
227+
string.sub(string.sub(suggestion.text, 1, (string.find(suggestion.text, "\n", 1, true) or 0) - 1), cursor_col)
222228

223229
local extmark = {
224230
id = copilot.extmark_id,

0 commit comments

Comments
 (0)