fix: upgrade plugins

README.md

@@ -19,6 +19,7 @@ go install github.com/jesseduffield/lazygit@latest
 npm install eslint --global
 npm install -g typescript typescript-language-server
 npm install -g @volar/vue-language-server
+npm install -g eslint_d
 ```
 
 ### 记忆项

init.lua

@@ -5,14 +5,12 @@ require("core.option")
 -- 加载插件配置文件
 -- 文件树
 require("plugins.file-tree")
--- 行号模式切换
-require("plugins.line-numbers")
--- 模糊搜索
-require("plugins.telescope")
+-- 默认配置
+require("plugins.peaceful")
+-- debug 配置
+require("plugins.debug")
 -- mason管理
 require("plugins.mason")
--- 终端管理
-require("plugins.terminal")
 -- bufferline
 require("plugins.bufferline")
 -- 空白缩进
@@ -20,23 +18,18 @@ require("plugins.indent_blackline")
 -- 底部状态
 require("plugins.lualine")
 -- 自动保存
-require("plugins.auto-save")
+require("plugins.auto-do")
 -- 通知
 require("plugins.notify")
 -- 格式化
 require("plugins.null-ls")
--- 错误列表
-require("plugins.trouble")
 -- git
 require("plugins.gitsigns")
 -- 快速跳转
 require("plugins.leap")
 -- 代码高亮配置
 require("plugins.treesitter")
--- lspsaga
-require("plugins.lspsaga")
--- golang lsp
-require("plugins.golang")
+-- lsp 配置
 require("lsp.init")
 require("lsp.bash")
 require("lsp.docker")
@@ -45,6 +38,10 @@ require("lsp.go")
 require("lsp.lua")
 require("lsp.protocol")
 require("lsp.volar")
+-- lspsaga
+require("plugins.lspsaga")
+-- golang lsp
+require("plugins.golang")
 
 -- 载入主题
 require("core.theme")

lua/core/keymapping.lua

@@ -7,7 +7,7 @@ local noreopt = { noremap = true, silent = true }
 -- save
 map.set({ "n", "i" }, "<C-s>", "<cmd>w<cr>", noreopt)
 -- format
-map.set({ "n", "i" }, "=", "<cmd>lua vim.lsp.buf.format()<cr>", noreopt)
+map.set({ "n", "v", "x" }, "=", "<cmd>lua vim.lsp.buf.format()<cr>", noreopt)
 -- fine cmdline
 map.set("n", ":", "<cmd>FineCmdline<CR>", noreopt)
 -- telescope

lua/core/option.lua

@@ -73,7 +73,6 @@ vim.opt.backup = false
 vim.opt.swapfile = false
 vim.opt.writebackup = false
 vim.opt.undofile = true
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 -- 开启 Folding
 vim.wo.foldmethod = "expr"
 vim.wo.foldexpr = "nvim_treesitter#foldexpr()"

lua/plugins/auto-do.lua

@@ -0,0 +1,6 @@
+require("auto-save").setup({
+    trigger_events = { "InsertLeave", "BufLeave", "BufWinLeave" },
+})
+require("nvim-autopairs").setup({})
+require("nvim-ts-autotag").setup({})
+require('unimpaired').setup({})

lua/plugins/auto-save.lua

@@ -1,3 +0,0 @@
-require("auto-save").setup {
-    trigger_events = {"InsertLeave", "BufLeave", "BufWinLeave"},
-}

lua/plugins/debug.lua

@@ -0,0 +1,7 @@
+require("dapui").setup()
+require("nvim-dap-virtual-text").setup()
+-- IMPORTANT: make sure to setup neodev BEFORE lspconfig
+require("neodev").setup({
+    -- add any options here, or leave empty to use the default settings
+    library = { plugins = { "nvim-dap-ui" }, types = true },
+})

lua/plugins/file-tree.lua

@@ -7,36 +7,41 @@ vim.opt.termguicolors = true
 
 -- OR setup with some options
 require("nvim-tree").setup({
-	sort_by = "case_sensitive",
-	view = {
-		width = 30,
-		mappings = {
-			list = {
-				{ key = "u", action = "dir_up" },
-			},
-		},
-	},
-	renderer = {
-		group_empty = true,
-	},
-	filters = {
-		dotfiles = true,
-	},
-})
+    auto_reload_on_write = true,
+    sort_by = "case_sensitive",
+    sync_root_with_cwd = true,
+    respect_buf_cwd = true,
+    update_focused_file = {
+        enable = true,
+        update_root = true,
+    },
+    filters = { custom = { ".git" } },
+    view = {
+        width = 30,
+        mappings = {
+            list = {
+                { key = "u", action = "dir_up" },
+            },
+        },
+    },
+    renderer = {
+        group_empty = true,
+    },
+    })
 
 local function open_nvim_tree(data)
-	-- buffer is a directory
-	local directory = vim.fn.isdirectory(data.file) == 1
+    -- buffer is a directory
+    local directory = vim.fn.isdirectory(data.file) == 1
 
-	if not directory then
-		return
-	end
+    if not directory then
+        return
+    end
 
-	-- change to the directory
-	vim.cmd.cd(data.file)
+    -- change to the directory
+    vim.cmd.cd(data.file)
 
-	-- open the tree
-	require("nvim-tree.api").tree.open()
+    -- open the tree
+    require("nvim-tree.api").tree.open()
 end
 
 vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })

lua/plugins/line-numbers.lua

@@ -1 +0,0 @@
-require("numbers").setup({})

lua/plugins/mason.lua

@@ -17,9 +17,7 @@ require("mason-lspconfig").setup({
 		"tsserver",
 		"volar",
 		"taplo",
-		"lemminx",
 		"yamlls",
-		"sqlls",
 		"jsonls",
 		"jdtls",
 		"bashls",

lua/plugins/null-ls.lua

@@ -3,41 +3,9 @@ local null_ls = require("null-ls")
 null_ls.setup({
 	sources = {
 		null_ls.builtins.formatting.stylua,
-        null_ls.builtins.formatting.buf,
-        null_ls.builtins.formatting.clang_format,
-        null_ls.builtins.formatting.dart_format,
-        null_ls.builtins.formatting.eslint_d,
-        null_ls.builtins.formatting.fixjson,
         null_ls.builtins.formatting.gofmt,
-        null_ls.builtins.formatting.goimports_reviser,
-        null_ls.builtins.formatting.google_java_format,
-        null_ls.builtins.formatting.markdownlint,
-        null_ls.builtins.formatting.markdown_toc,
-        null_ls.builtins.formatting.rustfmt,
-        null_ls.builtins.formatting.shfmt,
-        null_ls.builtins.formatting.taplo,
-        null_ls.builtins.formatting.xmllint,
-        null_ls.builtins.formatting.yamlfmt,
+        null_ls.builtins.formatting.eslint_d,
         -- 诊断
-        null_ls.builtins.diagnostics.buf,
-        null_ls.builtins.diagnostics.checkmake,
-        null_ls.builtins.diagnostics.checkstyle,
-        null_ls.builtins.diagnostics.clang_check,
-        null_ls.builtins.diagnostics.cppcheck,
         null_ls.builtins.diagnostics.eslint_d,
-        null_ls.builtins.diagnostics.gitlint,
-        null_ls.builtins.diagnostics.golangci_lint,
-        null_ls.builtins.diagnostics.jsonlint,
-        null_ls.builtins.diagnostics.shellcheck,
-        null_ls.builtins.diagnostics.yamllint,
-        -- 动作
-        null_ls.builtins.code_actions.eslint_d,
-        null_ls.builtins.code_actions.gitrebase,
-        null_ls.builtins.code_actions.gitsigns,
-        null_ls.builtins.code_actions.gomodifytags,
-        null_ls.builtins.code_actions.shellcheck,
-        null_ls.builtins.code_actions.xo,
-        -- 完成
-        null_ls.builtins.completion.luasnip,
-	},
+    }
 })

lua/plugins/peaceful.lua

@@ -0,0 +1,12 @@
+-- url罗列
+require("urlview").setup({})
+-- 行号模式切换
+require("numbers").setup({})
+-- 终端管理
+require("toggleterm").setup({})
+-- 错误列表
+require("trouble").setup({})
+-- 模糊搜索
+require("telescope").setup({})
+-- 快捷键提示
+require("which-key").setup({})

lua/plugins/telescope.lua

@@ -1 +0,0 @@
-require("telescope").setup({})

lua/plugins/terminal.lua

@@ -1 +0,0 @@
-require("toggleterm").setup({})

lua/plugins/trouble.lua

@@ -1 +0,0 @@
-require("trouble").setup({})

lua/setup.lua

@@ -56,7 +56,6 @@ return require("packer").startup(function(use)
         })
         -- 通知
         use({ "rcarriga/nvim-notify" })
-
         -- 缩进线
         use({ "lukas-reineke/indent-blankline.nvim" })
         -- 注释管理
@@ -72,15 +71,16 @@ return require("packer").startup(function(use)
             "nvim-lualine/lualine.nvim",
             requires = { "kyazdani42/nvim-web-devicons", opt = true },
         })
-        use({
-            "windwp/nvim-autopairs",
-            config = function()
-                require("nvim-autopairs").setup({})
-            end,
-        })
+        -- 自动修复部分按键
+        use({ "tummetott/unimpaired.nvim" })
+        -- 标签补全
+        use({ "windwp/nvim-autopairs" })
+        use({ "windwp/nvim-ts-autotag" })
+        -- 自动保存
         use({
             "Pocco81/auto-save.nvim",
         })
+        -- lspsaga
         use({
             "glepnir/lspsaga.nvim",
             branch = "main",
@@ -148,7 +148,23 @@ return require("packer").startup(function(use)
         })
         -- 高亮当前关键词
         use({ "RRethy/vim-illuminate" })
-
+        -- 罗列文件中的所有url
+        use("axieax/urlview.nvim")
+        -- 快捷键提示
+        use({
+            "folke/which-key.nvim",
+            config = function()
+                vim.o.timeout = true
+                vim.o.timeoutlen = 300
+            end,
+        })
+        -- debug
+        use({
+            "theHamsta/nvim-dap-virtual-text",
+            "rcarriga/nvim-dap-ui",
+            "mfussenegger/nvim-dap",
+            "folke/neodev.nvim",
+        })
         -- 自动保存
         if packer_bootstrap then
             require("packer").sync()