chore(comment): add comment and table merge

This commit is contained in:
aqav 2023-08-08 15:04:15 +08:00
parent 1477849a78
commit 5e25b7c9ab

View file

@ -1,34 +1,36 @@
return { return {
-- add Java to nvim-treesitter
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
opts = { opts = function(_, opts)
ensure_installed = { opts.ensure_installed = opts.ensure_installed or {}
"java", vim.list_extend(opts.ensure_installed, { "java" })
}, end,
},
}, },
-- install Java LSP
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
opts = { opts = function(_, opts)
ensure_installed = { opts.ensure_installed = opts.ensure_installed or {}
"jdtls", vim.list_extend(opts.ensure_installed, { "jdtls" })
}, end,
},
}, },
-- install java-debug-adapter and java-test
-- https://github.com/jay-babu/mason-nvim-dap.nvim/blob/main/lua/mason-nvim-dap/mappings/source.lua
{ {
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
dependencies = { dependencies = {
{ {
"jay-babu/mason-nvim-dap.nvim", "jay-babu/mason-nvim-dap.nvim",
opts = { opts = function(_, opts)
ensure_installed = { opts.ensure_installed = opts.ensure_installed or {}
"javadbg", vim.list_extend(opts.ensure_installed, { "javadbg", "javatest" })
"javatest", end,
},
},
}, },
}, },
}, },
-- don't setup jdtls with lspconfig
-- https://github.com/mfussenegger/nvim-jdtls#nvim-lspconfig-and-nvim-jdtls-differences
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
opts = { opts = {
@ -39,9 +41,10 @@ return {
}, },
}, },
}, },
-- setup jdtls
{ {
"mfussenegger/nvim-jdtls", "mfussenegger/nvim-jdtls",
dependencies = { dependencies = { -- add all dependencies used below
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
@ -87,6 +90,7 @@ return {
settings = { settings = {
java = {}, java = {},
}, },
-- silent setup
handlers = { handlers = {
["$/progress"] = function() end, ["$/progress"] = function() end,
["language/status"] = function() end, ["language/status"] = function() end,
@ -98,9 +102,10 @@ return {
}, },
}, },
filetypes = { "java" }, filetypes = { "java" },
capabilities = require("cmp_nvim_lsp").default_capabilities(), capabilities = require("cmp_nvim_lsp").default_capabilities(), -- enable CMP capabilities
} }
-- attach every Java buffer
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = "java", pattern = "java",
callback = function() callback = function()
@ -108,6 +113,9 @@ return {
end, end,
}) })
-- setup keymap and DAP after the LSP is fully attached
-- https://github.com/mfussenegger/nvim-jdtls#nvim-dap-configuration
-- https://neovim.io/doc/user/lsp.html#LspAttach
vim.api.nvim_create_autocmd("LspAttach", { vim.api.nvim_create_autocmd("LspAttach", {
pattern = "*.java", pattern = "*.java",
callback = function(args) callback = function(args)