fix(conform): make lsp_fallback
option user configurable (#2616)
This commit is contained in:

committed by
GitHub

parent
2a666ac5f2
commit
afca0b7876
@ -84,6 +84,7 @@ return {
|
||||
timeout_ms = 3000,
|
||||
async = false, -- not recommended to change
|
||||
quiet = false, -- not recommended to change
|
||||
lsp_fallback = true, -- not recommended to change
|
||||
},
|
||||
---@type table<string, conform.FormatterUnit[]>
|
||||
formatters_by_ft = {
|
||||
|
@ -109,13 +109,18 @@ end
|
||||
|
||||
---@param opts? lsp.Client.format
|
||||
function M.format(opts)
|
||||
opts = vim.tbl_deep_extend("force", {}, opts or {}, require("lazyvim.util").opts("nvim-lspconfig").format or {})
|
||||
opts = vim.tbl_deep_extend(
|
||||
"force",
|
||||
{},
|
||||
opts or {},
|
||||
require("lazyvim.util").opts("nvim-lspconfig").format or {},
|
||||
require("lazyvim.util").opts("conform.nvim").format or {}
|
||||
)
|
||||
local ok, conform = pcall(require, "conform")
|
||||
-- use conform for formatting with LSP when available,
|
||||
-- since it has better format diffing
|
||||
if ok then
|
||||
opts.formatters = {}
|
||||
opts.lsp_fallback = true
|
||||
conform.format(opts)
|
||||
else
|
||||
vim.lsp.buf.format(opts)
|
||||
|
Reference in New Issue
Block a user