From 9ebeb43013d6a8b61c9064141aac13ed32fe213a Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 26 Jan 2024 13:25:09 +0100 Subject: [PATCH] attempt at getting bash code_actions --- .config/nvim/lua/config/lsp/null.lua | 7 +++++++ .config/nvim/lua/config/lsp/servers.lua | 8 ++++++++ .config/nvim/lua/plugins/lsp/null-ls.lua | 12 +++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .config/nvim/lua/config/lsp/null.lua diff --git a/.config/nvim/lua/config/lsp/null.lua b/.config/nvim/lua/config/lsp/null.lua new file mode 100644 index 00000000..92f60600 --- /dev/null +++ b/.config/nvim/lua/config/lsp/null.lua @@ -0,0 +1,7 @@ +return function() + local nb = require("null-ls").builtins + return { + nb.code_actions.shellcheck, + nb.diagnostics.shellcheck + } +end diff --git a/.config/nvim/lua/config/lsp/servers.lua b/.config/nvim/lua/config/lsp/servers.lua index 0fc31391..5da7c66e 100644 --- a/.config/nvim/lua/config/lsp/servers.lua +++ b/.config/nvim/lua/config/lsp/servers.lua @@ -8,6 +8,14 @@ conf.handlers["intelephense"] = { } } +conf.handlers["bashls"] = { + settings = { + bashIde = { + shellcheckPath = vim.fn.stdpath "data" .. "mason/bin/shellcheck" + } + } +} + conf.required = { "lua_ls", "bashls" } return conf diff --git a/.config/nvim/lua/plugins/lsp/null-ls.lua b/.config/nvim/lua/plugins/lsp/null-ls.lua index 1633bd36..a773520a 100644 --- a/.config/nvim/lua/plugins/lsp/null-ls.lua +++ b/.config/nvim/lua/plugins/lsp/null-ls.lua @@ -7,8 +7,18 @@ M.dependencies = { "mason-null-ls.nvim" } M.opts = function() return { root_dir = require("null-ls.utils").root_pattern(".null-ls-root", "Makefile", ".git", "ansible.cfg"), - on_attach = require("funcs").lsp_on_attach + on_attach = require("funcs").lsp_on_attach, + sources = require("config.lsp.null")(), } end +-- M.init = function() +-- vim.api.nvim_create_autocmd({ "LspAttach" }, { +-- desc = "Ensure null-ls run its sources a lsp client starts", +-- callback = function() +-- pcall(require("null-ls").enable, {}) +-- end, +-- }) +-- end + return M