refactor(nvim): reorganize lsp setup

This commit is contained in:
Price Hiller 2024-06-05 16:05:07 -05:00
parent e732a14c92
commit 248d3353ed
Signed by: Price
GPG Key ID: C3FADDE7A8534BEB

View File

@ -145,10 +145,40 @@ return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = {
"Decodetalkers/csharpls-extended-lsp.nvim", "Decodetalkers/csharpls-extended-lsp.nvim",
"williamboman/mason-lspconfig.nvim", {
"williamboman/mason-lspconfig.nvim",
dependencies = {
"neovim/nvim-lspconfig",
},
opts = {
automatic_installation = true,
ensure_installed = {
"tsserver",
},
},
},
{ {
"nvim-java/nvim-java", "nvim-java/nvim-java",
config = true, ft = { "java" },
config = function()
require("java").setup()
require("lspconfig").jdtls.setup({
capabilities = lsp_capabilities,
on_attach = on_attach,
settings = {
java = {
inlayHints = {
parameterNames = {
enabled = "all",
exclusions = { "this" },
},
},
},
},
})
end,
dependencies = { dependencies = {
"nvim-java/lua-async-await", "nvim-java/lua-async-await",
"nvim-java/nvim-java-refactor", "nvim-java/nvim-java-refactor",
@ -156,21 +186,19 @@ return {
"nvim-java/nvim-java-test", "nvim-java/nvim-java-test",
"nvim-java/nvim-java-dap", "nvim-java/nvim-java-dap",
"MunifTanjim/nui.nvim", "MunifTanjim/nui.nvim",
"neovim/nvim-lspconfig",
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
{ "williamboman/mason.nvim",
"williamboman/mason.nvim",
opts = {
registries = {
"github:nvim-java/mason-registry",
"github:mason-org/mason-registry",
},
},
},
}, },
}, },
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
opts = {
max_concurrent_installers = 12,
registries = {
"github:nvim-java/mason-registry",
"github:mason-org/mason-registry",
},
},
cmd = { cmd = {
"Mason", "Mason",
"MasonLog", "MasonLog",
@ -179,11 +207,7 @@ return {
"MasonUninstall", "MasonUninstall",
"MasonUninstallAll", "MasonUninstallAll",
}, },
opts = {
max_concurrent_installers = 12,
},
}, },
"simrat39/rust-tools.nvim",
"Hoffs/omnisharp-extended-lsp.nvim", "Hoffs/omnisharp-extended-lsp.nvim",
"b0o/schemastore.nvim", "b0o/schemastore.nvim",
{ {
@ -282,17 +306,8 @@ return {
}, },
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
config = function() config = function()
local mason_lspconfig = require("mason-lspconfig")
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
-- NOTE: Keep this near top
mason_lspconfig.setup({
automatic_installation = true,
ensure_installed = {
"tsserver",
},
})
-- NOTE: ANSIBLE LSP -- NOTE: ANSIBLE LSP
-- I use ansible a lot, define exceptions for servers that can use -- I use ansible a lot, define exceptions for servers that can use
-- server:setup & vim.cmd at the bottom here -- server:setup & vim.cmd at the bottom here
@ -484,7 +499,6 @@ return {
"eslint", "eslint",
"html", "html",
"cssls", "cssls",
"jdtls",
"kotlin_language_server", "kotlin_language_server",
"terraformls", "terraformls",
"tflint", "tflint",