Merge branch 'master' into laptop
This commit is contained in:
commit
6660cf5e98
|
@ -11,6 +11,6 @@ return {
|
|||
'neovim/nvim-lspconfig'
|
||||
},
|
||||
opts = {
|
||||
ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex", "gopls", "rust_analyzer", "jdtls", "emmet_ls", "ruff_lsp" },
|
||||
ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex", "gopls", "rust_analyzer", "jdtls", "emmet_ls", "ruff_lsp", "csharp_ls" },
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,15 +6,15 @@ return {
|
|||
null_ls.setup({
|
||||
root_dir = require("null-ls.utils").root_pattern(".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"),
|
||||
sources = {
|
||||
null_ls.builtins.completion.spell,
|
||||
null_ls.builtins.code_actions.proselint,
|
||||
null_ls.builtins.diagnostics.proselint,
|
||||
null_ls.builtins.diagnostics.codespell,
|
||||
-- null_ls.builtins.completion.spell,
|
||||
-- null_ls.builtins.code_actions.proselint,
|
||||
-- null_ls.builtins.diagnostics.proselint,
|
||||
-- null_ls.builtins.diagnostics.codespell,
|
||||
null_ls.builtins.diagnostics.shellcheck,
|
||||
null_ls.builtins.formatting.shellharden,
|
||||
null_ls.builtins.formatting.shfmt,
|
||||
-- null_ls.builtins.diagnostics.cppcheck,
|
||||
null_ls.builtins.diagnostics.selene
|
||||
-- null_ls.builtins.diagnostics.selene
|
||||
}
|
||||
})
|
||||
end,
|
||||
|
|
|
@ -147,6 +147,10 @@ return {
|
|||
capabilities = capabilities
|
||||
}
|
||||
|
||||
require('lspconfig').csharp_ls.setup {
|
||||
capabilities = capabilities
|
||||
}
|
||||
|
||||
require('lspconfig').cmake.setup {
|
||||
capabilities = capabilities
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue