fix: remmove nvim-treesitter-endwise, add b:workspace_folder

jiangyinzuo · Sep 9, 2024 · 95c2c6a · 95c2c6a
1 parent 4082f5e
commit 95c2c6a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/root/.config/nvim/lua/plugins/ai.lua b/root/.config/nvim/lua/plugins/ai.lua
@@ -36,7 +36,21 @@ elseif vim.g.ai_complete == "copilot" then
 			-- See Commands section for default commands if you want to lazy load on them
 		},
 		"github/copilot.vim",
-		-- https://github.com/olimorris/codecompanion.nvim
+		-- https://github.com/magicalne/nvim.ai
+		-- {
+		-- 	"olimorris/codecompanion.nvim",
+		-- 	dependencies = {
+		-- 		"nvim-lua/plenary.nvim",
+		-- 		"nvim-treesitter/nvim-treesitter",
+		-- 		"hrsh7th/nvim-cmp", -- Optional: For using slash commands and variables in the chat buffer
+		-- 		"nvim-telescope/telescope.nvim", -- Optional: For working with files with slash commands
+		-- 		-- {
+		-- 		-- 	"stevearc/dressing.nvim", -- Optional: Improves the default Neovim UI
+		-- 		-- 	opts = {},
+		-- 		-- },
+		-- 	},
+		-- 	config = true
+		-- },
 		-- {
 		-- 	"yetone/avante.nvim",
 		-- 	event = "VeryLazy",

diff --git a/root/.config/nvim/lua/plugins/init.lua b/root/.config/nvim/lua/plugins/init.lua
@@ -20,7 +20,7 @@ return {
 		build = ":TSUpdate",
 		config = plugins_setup.nvim_treesitter,
 		dependencies = {
-			"RRethy/nvim-treesitter-endwise",
+			-- "RRethy/nvim-treesitter-endwise",
 		},
 	},
 	{

diff --git a/root/.config/nvim/lua/plugins/vimplug.lua b/root/.config/nvim/lua/plugins/vimplug.lua
@@ -111,6 +111,7 @@ local M = {
 			"inkarkat/vim-ingo-library",
 		},
 	},
+	"tpope/vim-endwise",
 	-- take place of 'airblade/vim-gitgutter',
 	{
 		"lewis6991/gitsigns.nvim",

diff --git a/root/.config/nvim/lua/plugins_setup.lua b/root/.config/nvim/lua/plugins_setup.lua
@@ -24,8 +24,9 @@ function M.nvim_treesitter()
 			enable = true,
 			additional_vim_regex_highlighting = false,
 		},
+		-- https://github.com/RRethy/nvim-treesitter-endwise
 		endwise = {
-			enable = true,
+			enable = false, -- nvim-treesitter-endwise is not maintained
 		},
 		-- https://github.com/andymass/vim-matchup
 		matchup = {

diff --git a/root/.vim/vimrc.d/ai.vim b/root/.vim/vimrc.d/ai.vim
@@ -21,6 +21,8 @@ if v:version >= 900 || has('nvim')
 		imap <M-w> <Plug>(copilot-accept-word)
 		imap <M-l> <Plug>(copilot-accept-line)
 		imap <M-s> <Plug>(copilot-suggest)
+		" copilot workspace folder
+		autocmd BufReadPost,BufNewFile * ++once let b:workspace_folder = asyncrun#current_root()
 
 	elseif g:ai_complete == 'codeium'
 		" Alternative: https://github.com/Exafunction/codeium.nvim