From 79f08da1221c7a561e8228a1ec36bfc3a24f8782 Mon Sep 17 00:00:00 2001
From: OlaleyeFisayo <festusolaleyef@gmail.com>
Date: Fri, 20 Jun 2025 03:02:27 +0100
Subject: [PATCH 1/3] fix(coc): disable nvim-autopairs and add default
 insert-mode keybindings

---
 lua/astrocommunity/lsp/coc-nvim/init.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lua/astrocommunity/lsp/coc-nvim/init.lua b/lua/astrocommunity/lsp/coc-nvim/init.lua
index 99452cd6a..092b20aff 100644
--- a/lua/astrocommunity/lsp/coc-nvim/init.lua
+++ b/lua/astrocommunity/lsp/coc-nvim/init.lua
@@ -72,6 +72,20 @@ return {
         end,
         desc = "Hover symbol details",
       }
+
+      -- FIX: Add insert mode keymaps for completion behavior
+      if not maps.i then maps.i = {} end
+      maps.i["<C-Space>"] = { "coc#refresh()", desc = "Trigger completion", expr = true, silent = true }
+      maps.i["<CR>"] = {
+        [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]],
+        expr = true,
+        noremap = true,
+        silent = true,
+      }
+      maps.i["<Tab>"] =
+        { [[coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"]], expr = true, noremap = true, silent = true }
+      maps.i["<S-Tab>"] =
+        { [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], expr = true, noremap = true, silent = true }
     end,
   },
   specs = {
@@ -164,5 +178,7 @@ return {
     { "rafamadriz/friendly-snippets", optional = true, enabled = false },
     -- blink
     { "Saghen/blink.cmp", optional = true, enabled = false },
+    -- autopairs
+    { "windwp/nvim-autopairs", optional = true, enabled = false },
   },
 }

From 123b5b0853df8c52faa20410c6d73cec16b7abdf Mon Sep 17 00:00:00 2001
From: Uzair Aftab <48220549+Uzaaft@users.noreply.github.com>
Date: Fri, 27 Jun 2025 09:59:29 +0200
Subject: [PATCH 2/3] Update lua/astrocommunity/lsp/coc-nvim/init.lua

---
 lua/astrocommunity/lsp/coc-nvim/init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/astrocommunity/lsp/coc-nvim/init.lua b/lua/astrocommunity/lsp/coc-nvim/init.lua
index 092b20aff..0de440859 100644
--- a/lua/astrocommunity/lsp/coc-nvim/init.lua
+++ b/lua/astrocommunity/lsp/coc-nvim/init.lua
@@ -73,7 +73,6 @@ return {
         desc = "Hover symbol details",
       }
 
-      -- FIX: Add insert mode keymaps for completion behavior
       if not maps.i then maps.i = {} end
       maps.i["<C-Space>"] = { "coc#refresh()", desc = "Trigger completion", expr = true, silent = true }
       maps.i["<CR>"] = {

From 59f69c51313e986b54fdad494e35e9ca438febd3 Mon Sep 17 00:00:00 2001
From: Uzair Aftab <uzaaft@outlook.com>
Date: Sat, 2 Aug 2025 12:05:13 +0200
Subject: [PATCH 3/3] refactor: remove unneeded if test

---
 lua/astrocommunity/lsp/coc-nvim/init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/astrocommunity/lsp/coc-nvim/init.lua b/lua/astrocommunity/lsp/coc-nvim/init.lua
index 0de440859..1dc05a966 100644
--- a/lua/astrocommunity/lsp/coc-nvim/init.lua
+++ b/lua/astrocommunity/lsp/coc-nvim/init.lua
@@ -73,7 +73,6 @@ return {
         desc = "Hover symbol details",
       }
 
-      if not maps.i then maps.i = {} end
       maps.i["<C-Space>"] = { "coc#refresh()", desc = "Trigger completion", expr = true, silent = true }
       maps.i["<CR>"] = {
         [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]],