Skip to content

Commit

Permalink
Move mason setup up further
Browse files Browse the repository at this point in the history
This helps if a user needs to find a mason executable
  • Loading branch information
Anthony-Fiddes committed Oct 7, 2023
1 parent 6ffc5a1 commit 36224da
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,11 @@ require('which-key').register {
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
}

-- mason-lspconfig requires that these setup functions are called in this order
-- before setting up the servers.
require('mason').setup()
require('mason-lspconfig').setup()

-- Enable the following language servers
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
--
Expand Down Expand Up @@ -489,11 +494,6 @@ require('neodev').setup()
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)

-- mason-lspconfig requires that these setup functions are called in this order
-- before setting up the servers.
require('mason').setup()
require('mason-lspconfig').setup()

-- Ensure the servers above are installed
local mason_lspconfig = require 'mason-lspconfig'

Expand Down

0 comments on commit 36224da

Please sign in to comment.