janishutz/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LSP] Migrate to new config format

Browse Source
This commit is contained in:
Janis Hutz 2025-06-04 15:30:13 +02:00
parent 17b1d19a93
commit 68c12127c2
1 changed files with 193 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
nvim/lua/plugins/lsp/lspconfig.lua
View File

@ -8,11 +8,8 @@ return {
"mfussenegger/nvim-jdtls", "mfussenegger/nvim-jdtls",
}, },
config = function() config = function()
-- import lspconfig plugin local lsp = vim.lsp
local lspconfig = require("lspconfig") local enable = vim.lsp.enable
-- import cmp-nvim-lsp plugin
local cmp_nvim_lsp = require("cmp_nvim_lsp")
local capabilities = require("lsp-options").capabilities local capabilities = require("lsp-options").capabilities
local on_attach = require("lsp-options").on_attach local on_attach = require("lsp-options").on_attach
@ -27,7 +24,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Bash │ -- │ Bash │
-- └ ┘ -- └ ┘
lspconfig.bashls.setup({ lsp.config("bashls", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
@ -35,7 +32,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ C, Cpp, objc │ -- │ C, Cpp, objc │
-- └ ┘ -- └ ┘
lspconfig.clangd.setup({ lsp.config("clangd", {
cmd = { cmd = {
"clangd", "clangd",
"--suggest-missing-includes", "--suggest-missing-includes",
@ -49,7 +46,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Rust │ -- │ Rust │
-- └ ┘ -- └ ┘
lspconfig.rust_analyzer.setup({ lsp.config("rust_analyzer", {
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {
diagnostics = { diagnostics = {
@ -64,17 +61,17 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ HTML, CSS, JSON │ -- │ HTML, CSS, JSON │
-- └ ┘ -- └ ┘
lspconfig.cssls.setup({ lsp.config("cssls", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
lspconfig.html.setup({ lsp.config("html", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
lspconfig.jsonls.setup({ lsp.config("jsonls", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
@ -82,7 +79,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ LUA │ -- │ LUA │
-- └ ┘ -- └ ┘
lspconfig.lua_ls.setup({ lsp.config("lua_ls", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
settings = { settings = {
@ -105,7 +102,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Markdown │ -- │ Markdown │
-- └ ┘ -- └ ┘
lspconfig.marksman.setup({ lsp.config("marksman", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
@ -113,26 +110,34 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Python │ -- │ Python │
-- └ ┘ -- └ ┘
lspconfig.pyright.setup({ lsp.config("pyright", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
-- ┌ ┐ -- ┌ ┐
-- │ Vue, TS, JS, TSX & JSX │ -- │ Vue │
-- └ ┘ -- └ ┘
local mason_packages = vim.fn.stdpath("data") .. "/mason/packages" lsp.config("vue_ls", {
local volar_path = mason_packages .. "/vue-language-server/node_modules/@vue/language-server" capabilities = capabilities,
lspconfig.ts_ls.setup({ on_attach = on_attach,
filetypes = {
"vue",
},
})
-- ┌ ┐
-- │ TS, JS, TSX, JSX │
-- └ ┘
lsp.config("ts_ls", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
init_options = { init_options = {
plugins = { plugins = {
{ {
name = "@vue/typescript-plugin", name = "@vue/typescript-plugin",
-- location = "/usr/lib/node_modules/@vue/typescript-plugin", location = "/usr/lib/node_modules/@vue/typescript-plugin",
location = volar_path, languages = { "javascript", "typescript", "vue" },
languages = { "vue" },
}, },
}, },
}, },
@ -148,7 +153,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ ASM │ -- │ ASM │
-- └ ┘ -- └ ┘
lspconfig.asm_lsp.setup({ lsp.config("asm_lsp", {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
}) })
@ -156,7 +161,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ LaTeX │ -- │ LaTeX │
-- └ ┘ -- └ ┘
lspconfig.texlab.setup({ lsp.config("texlab", {
cmd = { "texlab" }, cmd = { "texlab" },
filetypes = { "tex", "latex", "bib" }, filetypes = { "tex", "latex", "bib" },
root_dir = function(fname) root_dir = function(fname)
@ -173,18 +178,35 @@ return {
local filename = lspconfutil.path.join(vim.loop.cwd(), fname) local filename = lspconfutil.path.join(vim.loop.cwd(), fname)
return root_pattern(filename) or lspconfutil.path.dirname(filename) return root_pattern(filename) or lspconfutil.path.dirname(filename)
end end
lspconfig.veridian.setup({ lsp.config("veridian", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
root_dir = verilog_root_dir, root_dir = verilog_root_dir,
}) })
lspconfig.verible.setup({ lsp.config("verible", {
-- cmd = { 'verible-verilog-ls', '--rules_config=/home/janis/.config/nvim/util/verible-conf.json' }, -- cmd = { 'verible-verilog-ls', '--rules_config=/home/janis/.config/nvim/util/verible-conf.json' },
cmd = { "verible-verilog-ls", "--rules=-no-trailing-spaces", "" }, cmd = { "verible-verilog-ls", "--rules=-no-trailing-spaces", "" },
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
root_dir = verilog_root_dir, root_dir = verilog_root_dir,
}) })
-- ╭───────────────────────────────────────────────╮
-- │ Enable the configs │
-- ╰───────────────────────────────────────────────╯
enable("bashls")
enable("clangd")
enable("rust_analyzer")
enable("marksman")
enable("vue_ls")
enable("ts_ls")
enable("texlab")
enable("asm_lsp")
enable("jsonls")
enable("cssls")
enable("html")
enable("lua_ls")
enable("pyright")
end, end,
} }