Skip to content

Commit 252e21a

Browse files
tomasgareauafunkenbusch
authored andcommitted
fix: prevent mason setup from being run twice (nvim-lua#1298)
* fix: prevent mason setup from being run twice Addresses nvim-lua#1297 Currently, we're calling `require('mason').setup(...)` twice: * once when setting it as a dependency of `nvim-lspconfig` (since we set `config = true`) * once in the `config` function we define for `nvim-lspconfig` Calling setup twice can cause issues with, e.g., setting the `PATH` option: you might append Mason's bin dir in one setup call and prepend it in the other. We've kept the setup of `mason` in the `nvim-lspconfig` dependencies table since leaving it to the `config` function caused some plugin-loading-order related issues in the past. See: * nvim-lua#210 * nvim-lua#554 * nvim-lua#555 * nvim-lua#865 * docs: tweak comments per review feedback
1 parent e1b91bf commit 252e21a

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

init.lua

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,9 @@ require('lazy').setup({
458458
'neovim/nvim-lspconfig',
459459
dependencies = {
460460
-- Automatically install LSPs and related tools to stdpath for Neovim
461-
{ 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
461+
-- Mason must be loaded before its dependents so we need to set it up here.
462+
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
463+
{ 'williamboman/mason.nvim', opts = {} },
462464
'williamboman/mason-lspconfig.nvim',
463465
'WhoIsSethDaniel/mason-tool-installer.nvim',
464466

@@ -647,13 +649,16 @@ require('lazy').setup({
647649
}
648650

649651
-- Ensure the servers and tools above are installed
650-
-- To check the current status of installed tools and/or manually install
651-
-- other tools, you can run
652+
--
653+
-- To check the current status of installed tools and/or manually install
654+
-- other tools, you can run
652655
-- :Mason
653656
--
654-
-- You can press `g?` for help in this menu.
655-
require('mason').setup()
656-
657+
-- You can press `g?` for help in this menu.
658+
--
659+
-- `mason` had to be setup earlier: to configure its options see the
660+
-- `dependencies` table for `nvim-lspconfig` above.
661+
--
657662
-- You can add other tools here that you want Mason to install
658663
-- for you, so that they are available from within Neovim.
659664
local ensure_installed = vim.tbl_keys(servers or {})

0 commit comments

Comments
 (0)