From 06de1aaed8eba0999649f2122e8563bc714562fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= Date: Wed, 28 Jun 2023 21:55:11 -0700 Subject: [PATCH 1/2] Make dismiss a noop when not visible --- lua/copilot/suggestion.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lua/copilot/suggestion.lua b/lua/copilot/suggestion.lua index d70e7182..8f7b1b48 100644 --- a/lua/copilot/suggestion.lua +++ b/lua/copilot/suggestion.lua @@ -95,7 +95,14 @@ 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 "" + else + return keymap.dismiss + end + end, { desc = "[copilot] dismiss suggestion", silent = true, }) @@ -215,10 +222,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, From 74ee4c853715d83bde1326cd731eccd00742a21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= Date: Wed, 28 Jun 2023 23:05:46 -0700 Subject: [PATCH 2/2] Update lua/copilot/suggestion.lua Co-authored-by: Munif Tanjim --- lua/copilot/suggestion.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/copilot/suggestion.lua b/lua/copilot/suggestion.lua index 8f7b1b48..a77aaf59 100644 --- a/lua/copilot/suggestion.lua +++ b/lua/copilot/suggestion.lua @@ -104,6 +104,7 @@ local function set_keymap(keymap) end end, { desc = "[copilot] dismiss suggestion", + expr = true, silent = true, }) end