mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-25 14:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(util.lsp): pass formatters_by_ft to opts

Browse source
This commit is contained in:
Iordanis Petkakis 2025-12-22 22:57:32 +02:00
parent c64a61734f
commit 2ec0ecb13c
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lua/lazyvim/util/lsp.lua
View file

@ -35,18 +35,14 @@ end
---@param opts? lsp.Client.format ---@param opts? lsp.Client.format
function M.format(opts) function M.format(opts)
opts = vim.tbl_deep_extend( opts = vim.tbl_deep_extend("force", {}, opts or {}, LazyVim.opts("nvim-lspconfig").format or {})
"force",
{},
opts or {},
LazyVim.opts("nvim-lspconfig").format or {},
LazyVim.opts("conform.nvim").format or {}
)
local ok, conform = pcall(require, "conform") local ok, conform = pcall(require, "conform")
-- use conform for formatting with LSP when available, -- use conform for formatting with LSP when available,
-- since it has better format diffing -- since it has better format diffing
if ok then if ok then
opts.formatters = {} -- It should be `nil`, otherwise it doesn't fetch options from `formatters_by_ft`,
-- see https://github.com/stevearc/conform.nvim/blob/5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25/lua/conform/init.lua#L417-L418
opts.formatters = nil
conform.format(opts) conform.format(opts)
else else
vim.lsp.buf.format(opts) vim.lsp.buf.format(opts)