From 9f034ab10650e306e178d5189ee9214a52f2e8e5 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 4 Oct 2023 14:41:00 +0200 Subject: [PATCH] fix(conform): dont try to merge formatter functions --- lua/lazyvim/plugins/extras/formatting/conform.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lua/lazyvim/plugins/extras/formatting/conform.lua b/lua/lazyvim/plugins/extras/formatting/conform.lua index ee914f8e..eb1db8b1 100644 --- a/lua/lazyvim/plugins/extras/formatting/conform.lua +++ b/lua/lazyvim/plugins/extras/formatting/conform.lua @@ -44,8 +44,10 @@ return { config = function(_, opts) opts.formatters = opts.formatters or {} for f, o in pairs(opts.formatters) do - local ok, formatter = pcall(require, "conform.formatters." .. f) - opts.formatters[f] = vim.tbl_deep_extend("force", {}, ok and formatter or {}, o) + if type(o) ~= "function" then + local ok, formatter = pcall(require, "conform.formatters." .. f) + opts.formatters[f] = vim.tbl_deep_extend("force", {}, ok and formatter or {}, o) + end end require("conform").setup(opts) end,