mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
plugins/conform: add str type for formatAfterSave
This commit is contained in:
parent
ace360b5de
commit
e9564ac336
2 changed files with 51 additions and 14 deletions
|
@ -40,9 +40,9 @@ in {
|
|||
formatOnSave =
|
||||
helpers.defaultNullOpts.mkNullable
|
||||
(
|
||||
with types;
|
||||
with helpers.nixvimTypes;
|
||||
either
|
||||
str
|
||||
strLuaFn
|
||||
(
|
||||
submodule {
|
||||
options = {
|
||||
|
@ -69,15 +69,23 @@ in {
|
|||
'';
|
||||
|
||||
formatAfterSave =
|
||||
helpers.defaultNullOpts.mkNullable (types.submodule {
|
||||
options = {
|
||||
lspFallback = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "See :help conform.format for details.";
|
||||
};
|
||||
};
|
||||
})
|
||||
helpers.defaultNullOpts.mkNullable
|
||||
(
|
||||
with helpers.nixvimTypes;
|
||||
either
|
||||
strLuaFn
|
||||
(
|
||||
submodule {
|
||||
options = {
|
||||
lspFallback = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "See :help conform.format for details.";
|
||||
};
|
||||
};
|
||||
}
|
||||
)
|
||||
)
|
||||
"see documentation"
|
||||
''
|
||||
If this is set, Conform will run the formatter asynchronously after save.
|
||||
|
@ -110,9 +118,12 @@ in {
|
|||
timeout_ms = formatOnSave.timeoutMs;
|
||||
}
|
||||
else helpers.mkRaw formatOnSave;
|
||||
format_after_save = helpers.ifNonNull' formatAfterSave {
|
||||
lsp_fallback = formatAfterSave.lspFallback;
|
||||
};
|
||||
format_after_save =
|
||||
if builtins.isAttrs formatAfterSave
|
||||
then {
|
||||
lsp_fallback = formatOnSave.lspFallback;
|
||||
}
|
||||
else helpers.mkRaw formatAfterSave;
|
||||
log_level = logLevel;
|
||||
notify_on_error = notifyOnError;
|
||||
inherit formatters;
|
||||
|
|
|
@ -94,4 +94,30 @@
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
custom_format_after_save_function = {
|
||||
plugins.conform-nvim = {
|
||||
enable = true;
|
||||
|
||||
formattersByFt = {
|
||||
lua = ["stylua"];
|
||||
python = ["isort" "black"];
|
||||
javascript = [["prettierd" "prettier"]];
|
||||
"*" = ["codespell"];
|
||||
"_" = ["trimWhitespace"];
|
||||
};
|
||||
|
||||
formatAfterSave = ''
|
||||
function(bufnr)
|
||||
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
|
||||
return
|
||||
end
|
||||
if not _conform_slow_format_filetypes[vim.bo[bufnr].filetype] then
|
||||
return
|
||||
end
|
||||
return { lsp_fallback = true }
|
||||
end
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue