mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-25 18:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(conform): dont try merging function formatters. Fixes #1582

Browse source
This commit is contained in:
Folke Lemaitre 2023-10-04 14:44:24 +02:00
parent 9f034ab106
commit f4750859f2
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lua/lazyvim/plugins/extras/formatting/conform.lua
View file

@ -43,10 +43,12 @@ return {
}, },
config = function(_, opts) config = function(_, opts)
opts.formatters = opts.formatters or {} opts.formatters = opts.formatters or {}
for f, o in pairs(opts.formatters) do for name, formatter in pairs(opts.formatters) do
if type(o) ~= "function" then if type(formatter) == "table" then
local ok, formatter = pcall(require, "conform.formatters." .. f) local ok, defaults = pcall(require, "conform.formatters." .. name)
opts.formatters[f] = vim.tbl_deep_extend("force", {}, ok and formatter or {}, o) if ok and type(defaults) == "table" then
opts.formatters[name] = vim.tbl_deep_extend("force", {}, defaults, formatter)
end
end end
end end
require("conform").setup(opts) require("conform").setup(opts)