From 278bcd8bf2017e187e963b515017341fdd87fe2f Mon Sep 17 00:00:00 2001 From: Steven Arcangeli Date: Thu, 26 Oct 2023 08:46:07 -0700 Subject: fix(formatexpr): use default formatexpr if no formatters or LSP clients (#55) --- lua/conform/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lua/conform/init.lua') diff --git a/lua/conform/init.lua b/lua/conform/init.lua index 724aad6..23c3818 100644 --- a/lua/conform/init.lua +++ b/lua/conform/init.lua @@ -665,6 +665,7 @@ M.will_fallback_lsp = function(options) end M.formatexpr = function(opts) + local lsp_format = require("conform.lsp_format") -- Change the defaults slightly from conform.format opts = vim.tbl_deep_extend("keep", opts or {}, { timeout_ms = 500, @@ -692,7 +693,7 @@ M.formatexpr = function(opts) } if M.format(opts) then return 0 - elseif opts.lsp_fallback then + elseif opts.lsp_fallback and not vim.tbl_isempty(lsp_format.get_format_clients(opts)) then -- No formatters were available; fall back to lsp formatter return vim.lsp.formatexpr({ timeout_ms = opts.timeout_ms }) else -- cgit v1.2.3-70-g09d2