languages: allow listOf format.type

This commit is contained in:
Ching Pei Yang 2025-08-23 16:04:51 +02:00
commit 70555904a0
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
22 changed files with 265 additions and 357 deletions

View file

@ -33,14 +33,11 @@
};
};
defaultFormat = "sqlfluff";
defaultFormat = ["sqlfluff"];
formats = {
sqlfluff = {
package = sqlfluffDefault;
config = {
command = getExe cfg.format.package;
append_args = ["--dialect=${cfg.dialect}"];
};
command = getExe sqlfluffDefault;
append_args = ["--dialect=${cfg.dialect}"];
};
};
@ -88,16 +85,10 @@ in {
enable = mkEnableOption "SQL formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
type = enum (attrNames formats);
type = singleOrListOf (enum (attrNames formats));
default = defaultFormat;
description = "SQL formatter to use";
};
package = mkOption {
type = package;
default = formats.${cfg.format.type}.package;
description = "SQL formatter package";
};
};
extraDiagnostics = {
@ -133,8 +124,13 @@ in {
(mkIf cfg.format.enable {
vim.formatter.conform-nvim = {
enable = true;
setupOpts.formatters_by_ft.sql = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
setupOpts.formatters_by_ft.sql = cfg.format.type;
setupOpts.formatters =
mapListToAttrs (name: {
inherit name;
value = formats.${name};
})
cfg.format.type;
};
})