Skip to content

Commit

Permalink
Merge pull request #2 from nvim-lua/master
Browse files Browse the repository at this point in the history
fix: prevent mason setup from being run twice (nvim-lua#1298)
  • Loading branch information
umtdg authored Jan 9, 2025
2 parents 5fb9843 + db4867a commit b48b58b
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,9 @@ require('lazy').setup({
'neovim/nvim-lspconfig',
dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim
{ 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
-- Mason must be loaded before its dependents so we need to set it up here.
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
{ 'williamboman/mason.nvim', opts = {} },
'williamboman/mason-lspconfig.nvim',
'WhoIsSethDaniel/mason-tool-installer.nvim',

Expand Down Expand Up @@ -656,13 +658,16 @@ require('lazy').setup({
}

-- Ensure the servers and tools above are installed
-- To check the current status of installed tools and/or manually install
-- other tools, you can run
--
-- To check the current status of installed tools and/or manually install
-- other tools, you can run
-- :Mason
--
-- You can press `g?` for help in this menu.
require('mason').setup()

-- You can press `g?` for help in this menu.
--
-- `mason` had to be setup earlier: to configure its options see the
-- `dependencies` table for `nvim-lspconfig` above.
--
-- You can add other tools here that you want Mason to install
-- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {})
Expand Down

0 comments on commit b48b58b

Please sign in to comment.