fix(conform): allow overriding all conform format options. Fixes #1790
This commit is contained in:
@ -2,9 +2,6 @@ local Util = require("lazyvim.util")
|
||||
|
||||
local M = {}
|
||||
|
||||
---@type ConformOpts
|
||||
local conform_opts = {}
|
||||
|
||||
---@param opts ConformOpts
|
||||
function M.setup(_, opts)
|
||||
for name, formatter in pairs(opts.formatters or {}) do
|
||||
@ -29,7 +26,6 @@ function M.setup(_, opts)
|
||||
opts[key] = nil
|
||||
end
|
||||
end
|
||||
conform_opts = opts
|
||||
require("conform").setup(opts)
|
||||
end
|
||||
|
||||
@ -57,11 +53,10 @@ return {
|
||||
priority = 100,
|
||||
primary = true,
|
||||
format = function(buf)
|
||||
require("conform").format(Util.merge({
|
||||
timeout_ms = conform_opts.format.timeout_ms,
|
||||
async = conform_opts.format.async,
|
||||
quiet = conform_opts.format.quiet,
|
||||
}, { bufnr = buf }))
|
||||
local plugin = require("lazy.core.config").plugins["conform.nvim"]
|
||||
local Plugin = require("lazy.core.plugin")
|
||||
local opts = Plugin.values(plugin, "opts", false)
|
||||
require("conform").format(Util.merge(opts.format, { bufnr = buf }))
|
||||
end,
|
||||
sources = function(buf)
|
||||
local ret = require("conform").list_formatters(buf)
|
||||
|
Reference in New Issue
Block a user