Add toggleFormatOnSave capability to conform

This commit is contained in:
Venkatesan Ravi 2025-03-31 21:01:51 +00:00
commit c688311e37
2 changed files with 67 additions and 38 deletions

View file

@ -1,11 +1,9 @@
{ {lib, ...}: let
config, inherit (lib.generators) mkLuaInline;
lib,
...
}: let
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) attrs nullOr; inherit (lib.types) attrs either nullOr;
inherit (lib.nvim.types) mkPluginSetupOption; inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.types) luaInline mkPluginSetupOption;
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]";
@ -29,31 +27,66 @@ 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 =
if config.vim.lsp.formatOnSave
then {
lsp_format = "fallback"; lsp_format = "fallback";
timeout_ms = 500; timeout_ms = 500;
} };
else null; in
mkOption {
type = nullOr (either attrs luaInline);
default =
mkLuaInline
# lua
''
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.
Note:
- When config.vim.lsp.formatOnSave is set to true, internally
vim.g.formatsave is set to true.
- vim.b.disableFormatSave initally equals !config.vim.lsp.formatOnSave.
- vim.b.disableFormatSave is toggled using the
mapping from config.vim.lsp.mappings.toggleFormatOnSave.
''; '';
}; };
format_after_save = mkOption { format_after_save = let
type = nullOr attrs; defaultFormatAfterSaveOpts = {lsp_format = "fallback";};
in
mkOption {
type = nullOr (either attrs luaInline);
default = default =
if config.vim.lsp.formatOnSave mkLuaInline
then {lsp_format = "fallback";} # lua
else null; ''
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.
Note:
- When config.vim.lsp.formatOnSave is set to true, internally
vim.g.formatsave is set to true.
- vim.b.disableFormatSave initally equals !config.vim.lsp.formatOnSave.
- vim.b.disableFormatSave is toggled using the
mapping from config.vim.lsp.mappings.toggleFormatOnSave.
''; '';
}; };
}; };

View file

@ -93,11 +93,7 @@ in {
}) })
end end
'' ''
else " else ""
vim.lsp.buf.format({
bufnr = bufnr,
})
"
} }
end, end,
}) })