Skip to content

Commit a52d653

Browse files
committed
Upgrade mason-lspconfig & update conform config to target neovim 0.11
1 parent dd4adb6 commit a52d653

2 files changed

Lines changed: 7 additions & 53 deletions

File tree

init.lua

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -616,22 +616,11 @@ require("lazy").setup({
616616
-- You can add other tools here that you want Mason to install
617617
-- for you, so that they are available from within Neovim.
618618
local ensure_installed = vim.tbl_keys(servers or {})
619-
vim.list_extend(ensure_installed, {
620-
"stylua", -- Used to format lua code
621-
})
622619
require("mason-tool-installer").setup({ ensure_installed = ensure_installed })
623620

624621
require("mason-lspconfig").setup({
625-
handlers = {
626-
function(server_name)
627-
local server = servers[server_name] or {}
628-
-- This handles overriding only values explicitly passed
629-
-- by the server configuration above. Useful when disabling
630-
-- certain features of an LSP (for example, turning off formatting for tsserver)
631-
server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {})
632-
require("lspconfig")[server_name].setup(server)
633-
end,
634-
},
622+
ensure_installed = ensure_installed,
623+
automatic_installation = true,
635624
})
636625
end,
637626
},
@@ -641,7 +630,7 @@ require("lazy").setup({
641630
opts = {
642631
notify_on_error = false,
643632
format_on_save = {
644-
timeout_ms = 500,
633+
timeout_ms = 5000,
645634
lsp_fallback = true,
646635
},
647636
formatters_by_ft = {
@@ -651,10 +640,10 @@ require("lazy").setup({
651640
--
652641
-- You can use a sub-list to tell conform to run *until* a formatter
653642
-- is found.
654-
javascript = { { "prettierd", "prettier" } },
655-
javasriptreact = { { "prettierd", "prettier" } },
656-
typescript = { { "prettierd", "prettier" } },
657-
typescriptreact = { { "prettierd", "prettier" } },
643+
javascript = { "prettierd", "prettier", stop_after_first = true },
644+
javasriptreact = { "prettierd", "prettier", stop_after_first = true },
645+
typescript = { "prettierd", "prettier", stop_after_first = true },
646+
typescriptreact = { "prettierd", "prettier", stop_after_first = true },
658647
},
659648
},
660649
},

lazy-lock.json

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)