summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Fiddes <11233666+Anthony-Fiddes@users.noreply.github.com>2023-10-07 16:14:26 -0700
committerAnthony Fiddes <11233666+Anthony-Fiddes@users.noreply.github.com>2023-10-07 16:14:26 -0700
commit36224daa1bfff3b2fe7067952f305111f99b356f (patch)
tree79911cbd64335dc06581d6b4722e8dd05e4153d5
parent6ffc5a169f090b0b4359deb6deff0b99ab123679 (diff)
Move mason setup up further
This helps if a user needs to find a mason executable
-rw-r--r--init.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/init.lua b/init.lua
index 4438ca1..11f55d0 100644
--- a/init.lua
+++ b/init.lua
@@ -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.
--
@@ -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'