Make conform respect config.vim.lsp.formatOnSave and config.vim.lsp.mappings.toggleFormatOnSave

This commit is contained in:
Venkatesan Ravi 2025-03-31 21:06:54 +00:00
commit 0ffd8321e9

View file

@ -1,12 +1,9 @@
{ {lib, ...}: let
pkgs, inherit (lib.generators) mkLuaInline;
lib, inherit (lib.options) mkOption mkEnableOption;
... inherit (lib.types) attrs either nullOr;
}: let inherit (lib.nvim.lua) toLuaObject;
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.nvim.types) luaInline mkPluginSetupOption;
inherit (lib.types) attrs enum nullOr;
inherit (lib.nvim.types) mkPluginSetupOption;
inherit (lib.nvim.lua) mkLuaInline;
in { in {
options.vim.formatter.conform-nvim = { options.vim.formatter.conform-nvim = {
enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]"; enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
@ -30,25 +27,46 @@ in {
description = "Default values when calling `conform.format()`"; description = "Default values when calling `conform.format()`";
}; };
format_on_save = mkOption { format_on_save = let
type = nullOr attrs; defaultFormatOnSaveOpts = {
default = {
lsp_format = "fallback"; lsp_format = "fallback";
timeout_ms = 500; timeout_ms = 500;
}; };
in
mkOption {
type = nullOr (either attrs luaInline);
default = mkLuaInline ''
function()
if not vim.g.formatsave or vim.b.disableFormatSave then
return
else
return ${toLuaObject defaultFormatOnSaveOpts}
end
end
'';
description = '' description = ''
Table that will be passed to `conform.format()`. If this Table or function(lualinline) that will be passed to `conform.format()`. If this
is set, Conform will run the formatter on save. is set, Conform will run the formatter on save.
''; '';
}; };
format_after_save = mkOption { format_after_save = let
type = nullOr attrs; defaultFormatAfterSaveOpts = {lsp_format = "fallback";};
default = {lsp_format = "fallback";}; in
mkOption {
type = nullOr (either attrs luaInline);
default = mkLuaInline ''
function()
if not vim.g.formatsave or vim.b.disableFormatSave then
return
else
return ${toLuaObject defaultFormatAfterSaveOpts}
end
end
'';
description = '' description = ''
Table that will be passed to `conform.format()`. If this Table or function(luainline) that will be passed to `conform.format()`. If this
is set, Conform will run the formatter asynchronously after is set, Conform will run the formatter asynchronously after save.
save.
''; '';
}; };
}; };