Skip to content
This repository was archived by the owner on Apr 16, 2024. It is now read-only.

Commit 3d74830

Browse files
committed
fix(langs): Fix issues lazyloading null-ls, c_sharp and with LspInstall
1 parent 57b50d1 commit 3d74830

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

lua/doom/modules/features/auto_install/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ auto_install.cmds = {
3636
{
3737
"LspInstall",
3838
function(opts)
39-
vim.cmd("packadd mason-lspconfig")
39+
require("lazy").load({ plugins = { "mason-lspconfig" } })
4040
vim.cmd("lua require('mason-lspconfig').setup(doom.features.auto_install.settings.lsp)")
4141
vim.cmd("LspInstall " .. opts.args)
4242
end,
4343
},
4444
{
4545
"LspUninstall",
4646
function(opts)
47-
vim.cmd("packadd mason-lspconfig")
47+
require("lazy").load({ plugins = { "mason-lspconfig" } })
4848
vim.cmd("lua require('mason-lspconfig').setup(doom.features.auto_install.settings.lsp)")
4949
vim.cmd("LspInstall " .. opts.args)
5050
end,

lua/doom/modules/features/linter/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ linter.packages = {
1515
"jose-elias-alvarez/null-ls.nvim",
1616
commit = "915558963709ea17c5aa246ca1c9786bfee6ddb4",
1717
dependencies={"neovim/nvim-lspconfig"},
18-
-- after = "nvim-lspconfig",
18+
lazy = true,
1919
},
2020
}
2121

lua/doom/modules/langs/c_sharp/init.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ c_sharp.autocmds = {
4848
"FileType",
4949
"cs,vb",
5050
langs_utils.wrap_language_setup("c_sharp", function()
51-
vim.cmd("packadd nvim-lspconfig")
52-
5351
if not c_sharp.settings.disable_lsp then
5452
langs_utils.use_lsp_mason(c_sharp.settings.lsp_name, {
5553
config = c_sharp.settings.lsp_config,

lua/doom/modules/langs/utils.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.use_null_ls = function(package_name, null_ls_path, configure_function)
5656
-- Check if null-ls is loaded and load it if not.
5757
local ok = pcall(require, "null-ls")
5858
if not ok then
59-
require("lazy").load("null-ls.nvim")
59+
require("lazy").load({ plugins = { "null-ls.nvim" } })
6060
end
6161

6262
local start_null_ls = function()

0 commit comments

Comments
 (0)