feat(copilot-lua-cmp): add blink.cmp support (#1350)

* feat(copilot-lua-cmp): add blink.cmp support

* add missing c-j keymap

* Use lowercase for keymap

* Update lua/astrocommunity/completion/copilot-lua-cmp/init.lua

Co-authored-by: Micah Halter <[email protected]>

* Update README.md

* refactor(copilot-lua-cmp): clean up implementation

---------

Co-authored-by: Micah Halter <[email protected]>
Co-authored-by: Micah Halter <[email protected]>

Author: azdanov

lua/astrocommunity/completion/copilot-lua-cmp/README.md

@@ -4,4 +4,16 @@ Fully featured & enhanced replacement for copilot.vim complete with API for inte
 
 **Repository:** <https://github.com/zbirenbaum/copilot.lua>
 
-_Note_: This plugin will also reconfigure `cmp` in AstroNvim to make `<Tab>` work with both auto completion in `cmp` and `copilot`.
+## Key Features
+
+- Seamless integration with nvim-cmp or blink.cmp
+- Enhanced keybindings for Copilot suggestions:
+  - `<Tab>` - Accept suggestion/Navigate completion menu
+  - `<C-x>` / `<C-z>` - Next/Previous suggestion
+  - `<C-right>` / `<C-l>` - Accept word
+  - `<C-down>` / `<C-j>` - Accept line
+  - `<C-c>` - Dismiss suggestion
+ 
+_Note_: This plugin will also reconfigure `<Tab>` in AstroNvim to work with both auto completion in `cmp` and `copilot`.
+
+The configuration includes support for [nvim-cmp](https://github.com/hrsh7th/nvim-cmp) and [blink.cmp](https://github.com/Saghen/blink.cmp) for improved completion behavior.

lua/astrocommunity/completion/copilot-lua-cmp/init.lua

@@ -1,3 +1,18 @@
+local function has_words_before()
+  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil
+end
+
+local function copilot_action(action)
+  local copilot = require "copilot.suggestion"
+  return function()
+    if copilot.is_visible() then
+      copilot[action]()
+      return true -- doesn't run the next command
+    end
+  end
+end
+
 return {
   "zbirenbaum/copilot.lua",
   specs = {
@@ -9,10 +24,7 @@ return {
         local cmp, copilot = require "cmp", require "copilot.suggestion"
         local snip_status_ok, luasnip = pcall(require, "luasnip")
         if not snip_status_ok then return end
-        local function has_words_before()
-          local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-          return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil
-        end
+
         if not opts.mapping then opts.mapping = {} end
         opts.mapping["<Tab>"] = cmp.mapping(function(fallback)
           if copilot.is_visible() then
@@ -28,35 +40,37 @@ return {
           end
         end, { "i", "s" })
 
-        opts.mapping["<C-x>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.next() end
-        end)
-
-        opts.mapping["<C-z>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.prev() end
-        end)
-
-        opts.mapping["<C-right>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.accept_word() end
-        end)
-
-        opts.mapping["<C-l>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.accept_word() end
-        end)
-
-        opts.mapping["<C-down>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.accept_line() end
-        end)
-
-        opts.mapping["<C-j>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.accept_line() end
-        end)
-
-        opts.mapping["<C-c>"] = cmp.mapping(function()
-          if copilot.is_visible() then copilot.dismiss() end
-        end)
+        opts.mapping["<C-X>"] = cmp.mapping(copilot_action "next")
+        opts.mapping["<C-Z>"] = cmp.mapping(copilot_action "prev")
+        opts.mapping["<C-Right>"] = cmp.mapping(copilot_action "accept_word")
+        opts.mapping["<C-L>"] = cmp.mapping(copilot_action "accept_word")
+        opts.mapping["<C-Down>"] = cmp.mapping(copilot_action "accept_line")
+        opts.mapping["<C-J>"] = cmp.mapping(copilot_action "accept_line")
+        opts.mapping["<C-C>"] = cmp.mapping(copilot_action "dismiss")
+      end,
+    },
+    {
+      "Saghen/blink.cmp",
+      optional = true,
+      opts = function(_, opts)
+        if not opts.keymap then opts.keymap = {} end
 
-        return opts
+        opts.keymap["<Tab>"] = {
+          copilot_action "accept",
+          "select_next",
+          "snippet_forward",
+          function(cmp)
+            if has_words_before() or vim.api.nvim_get_mode().mode == "c" then return cmp.show() end
+          end,
+          "fallback",
+        }
+        opts.keymap["<C-X>"] = { copilot_action "next" }
+        opts.keymap["<C-Z>"] = { copilot_action "prev" }
+        opts.keymap["<C-Right>"] = { copilot_action "accept_word" }
+        opts.keymap["<C-L>"] = { copilot_action "accept_word" }
+        opts.keymap["<C-Down>"] = { copilot_action "accept_line" }
+        opts.keymap["<C-J>"] = { copilot_action "accept_line", "select_next", "fallback" }
+        opts.keymap["<C-C>"] = { copilot_action "dismiss" }
       end,
     },
   },