mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-24 17:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(format): set formatexpr in options so users can override it. Fixes #1759

Browse source
This commit is contained in:
Folke Lemaitre 2023-10-16 23:01:18 +02:00
parent fef0b3f756
commit ff64cc5399
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/lazyvim/config/options.lua
View file

@ -87,5 +87,7 @@ else
vim.opt.foldmethod = "indent"
end
vim.o.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
-- Fix markdown indentation settings
vim.g.markdown_recommended_style = 0

1
lua/lazyvim/plugins/formatting.lua
View file

@ -50,7 +50,6 @@ return {
},
},
init = function()
vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
-- Install the conform formatter on VeryLazy
require("lazyvim.util").on_very_lazy(function()
require("lazyvim.util").format.register({

9
lua/lazyvim/util/format.lua
View file

@ -25,6 +25,13 @@ function M.register(formatter)
end)
end
function M.formatexpr()
if Util.has("conform.nvim") then
return require("conform").formatexpr()
end
return vim.lsp.formatexpr({ timeout_ms = 3000 })
end
---@param buf? number
---@return (LazyFormatter|{active:boolean,resolved:string[]})[]
function M.resolve(buf)
@ -67,7 +74,7 @@ function M.info(buf)
end
end
if not have then
lines[#lines+1] = "\n***No formatters available for this buffer.***"
lines[#lines + 1] = "\n***No formatters available for this buffer.***"
end
Util[enabled and "info" or "warn"](
table.concat(lines, "\n"),