From 03701f361661c06067e7e9a4d3c7731affac9892 Mon Sep 17 00:00:00 2001
From: sudacode <suda@sudacode.com>
Date: Sun, 16 Feb 2025 14:14:13 -0800
Subject: [PATCH] fix cmp and codecompanion

- remove blink dependency
- set up telescope as default provider for codecompanion slash commands
---
 lazy-lock.json                |  3 +--
 lua/core/lazy.lua             |  1 +
 lua/extensions/telescope.lua  |  8 ++++++++
 lua/plugins/codecompanion.lua | 22 ++++++++++++++++++++++
 lua/plugins/lspconfig.lua     |  1 -
 lua/plugins/mini.lua          |  2 +-
 lua/plugins/telescope.lua     | 10 +---------
 7 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 lua/extensions/telescope.lua

diff --git a/lazy-lock.json b/lazy-lock.json
index 90deb98..5c4187b 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,7 +2,6 @@
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "any-jump.vim": { "branch": "master", "commit": "f95674d9a4251ac02f452d5f1861e4422f4652c7" },
   "auto-format.nvim": { "branch": "main", "commit": "1e3c069753d4b0960b351292c1a01af1b122907c" },
-  "blink.cmp": { "branch": "main", "commit": "93052a80660d741a051d43dc487c8bf7a2530b11" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "catppuccin": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" },
   "cmp-async-path": { "branch": "main", "commit": "d6d1ffa2075039632a2d71e8fa139818e15ac757" },
@@ -11,7 +10,7 @@
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "codecompanion.nvim": { "branch": "main", "commit": "0ec5921712a426607be0c3c9f0a54b2c86467d4f" },
+  "codecompanion.nvim": { "branch": "main", "commit": "0a28b6147d77cac6029da8f751454ce6a65473b2" },
   "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
   "copilot-lualine": { "branch": "main", "commit": "dc4b8ed0f75bc2557b3158c526624bf04ad233ea" },
   "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" },
diff --git a/lua/core/lazy.lua b/lua/core/lazy.lua
index a9e5f49..b001a54 100644
--- a/lua/core/lazy.lua
+++ b/lua/core/lazy.lua
@@ -35,3 +35,4 @@ require("lazy").setup({
 vim.cmd("colorscheme catppuccin")
 require("core.keymaps")
 require("core.lsp-notifications")
+require("extensions.telescope")
diff --git a/lua/extensions/telescope.lua b/lua/extensions/telescope.lua
new file mode 100644
index 0000000..3c84504
--- /dev/null
+++ b/lua/extensions/telescope.lua
@@ -0,0 +1,8 @@
+local ts = require("telescope")
+ts.load_extension("fzf")
+ts.load_extension("glyph")
+ts.load_extension("color_names")
+-- ts.load_extension("notify")
+ts.load_extension("cmdline")
+ts.load_extension("file_browser")
+ts.load_extension("codecompanion")
diff --git a/lua/plugins/codecompanion.lua b/lua/plugins/codecompanion.lua
index 3b432ba..8728eac 100644
--- a/lua/plugins/codecompanion.lua
+++ b/lua/plugins/codecompanion.lua
@@ -29,6 +29,28 @@ return {
 		strategies = {
 			chat = {
 				adapter = "copilot",
+				slash_commands = {
+					["file"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+					["symbols"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+					["buffer"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+					["terminal"] = {
+						opts = {
+							provider = "telescope",
+						},
+					},
+				},
 			},
 			inline = {
 				adapter = "copilot",
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index 5db24c4..876bc38 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -1,6 +1,5 @@
 return {
 	"neovim/nvim-lspconfig",
-	dependencies = { "saghen/blink.cmp" },
 	config = function()
 		local lspconfig = require("lspconfig")
 		vim.notify = require("notify")
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
index 6536208..456b3d9 100644
--- a/lua/plugins/mini.lua
+++ b/lua/plugins/mini.lua
@@ -1,6 +1,6 @@
 return {
 	"echasnovski/mini.diff",
-	depends = "echasnovski/mini.nvim",
+	depends = { "echasnovski/mini.nvim" },
 	opts = {
 
 		-- Options for how hunks are visualized
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index fea3a08..1fc0fdc 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -1,6 +1,7 @@
 return {
 	"nvim-telescope/telescope.nvim",
 	dependencies = {
+		"nvim-lua/plenary.nvim",
 		"jonarrien/telescope-cmdline.nvim",
 		"nat-418/telescope-color-names.nvim",
 		"nvim-telescope/telescope-file-browser.nvim",
@@ -107,13 +108,4 @@ return {
 			},
 		},
 	},
-	config = function()
-		local ts = require("telescope")
-		ts.load_extension("fzf")
-		ts.load_extension("glyph")
-		ts.load_extension("color_names")
-		-- ts.load_extension("notify")
-		ts.load_extension("cmdline")
-		ts.load_extension("file_browser")
-	end,
 }