From 3d12ba9dc89bbb4d8289aab4eaffd9cde9a5fe51 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Mon, 17 Mar 2025 15:57:08 +0100 Subject: [PATCH] [Verilog] Improve diagnostics --- nvim/lua/plugins/lsp/lspconfig.lua | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nvim/lua/plugins/lsp/lspconfig.lua b/nvim/lua/plugins/lsp/lspconfig.lua index 4c16848..61c48f8 100755 --- a/nvim/lua/plugins/lsp/lspconfig.lua +++ b/nvim/lua/plugins/lsp/lspconfig.lua @@ -185,15 +185,24 @@ return { end, } + local lspconfutil = require 'lspconfig/util' + local root_pattern = lspconfutil.root_pattern("veridian.yml", ".git", ".xpr") + local verilog_root_dir = function () + local filename = lspconfutil.path.join(vim.loop.cwd(), fname) + return root_pattern(filename) or lspconfutil.path.dirname(filename) + end lspconfig.veridian.setup { - cmd = { 'veridian' }, capabilities = capabilities, on_attach = on_attach, + root_dir = verilog_root_dir } lspconfig.verible.setup( { + -- cmd = { 'verible-verilog-ls', '--rules_config=/home/janis/.config/nvim/util/verible-conf.json' }, + cmd = { 'verible-verilog-ls', '--rules=-no-trailing-spaces', '' }, capabilities = capabilities, - on_attach = on_attach + on_attach = on_attach, + root_dir = verilog_root_dir } ) end,