NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-02-03 18:35:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/formatters: allow multiple formatters (#1103)

Browse source 
* language/python: allow multiple formatters

* package: add prettier-plugin-astro

* language/astro: fix prettier, remove prettierd

* package: add prettier-plugin-svelte

* language/svelte: fix prettier, remove prettierd

* languages: allow listOf format.type

* deprecations: add warnings for removed format options

* ruby: remove unused variable

* nix: fix outdated references to format.package

* docs: update release note

* treewide: warn deprecation in singleOrListOf

* conform: add definitions for setupOpts.formatters
This commit is contained in:
Ching Pei Yang 2025-11-16 19:49:21 +01:00 • committed by GitHub
commit d5da1a14c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
47 changed files with 641 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/plugins/languages/bash.nix
View file

@ -8,9 +8,9 @@
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum package bool;
inherit (lib.types) enum bool;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.types) diagnostics mkGrammarOption singleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.bash;
@ -30,10 +30,10 @@
};
};
defaultFormat = "shfmt";
defaultFormat = ["shfmt"];
formats = {
shfmt = {
package = pkgs.shfmt;
command = getExe pkgs.shfmt;
};
};
@ -55,7 +55,7 @@ in {
lsp = {
enable = mkEnableOption "Bash LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
type = singleOrListOf (enum (attrNames servers));
type = deprecatedSingleOrListOf "vim.language.bash.lsp.servers" (enum (attrNames servers));
default = defaultServers;
description = "Bash LSP server to use";
};
@ -68,16 +68,10 @@ in {
description = "Enable Bash formatting";
};
type = mkOption {
type = enum (attrNames formats);
type = deprecatedSingleOrListOf "vim.language.bash.format.type" (enum (attrNames formats));
default = defaultFormat;
description = "Bash formatter to use";
};
package = mkOption {
type = package;
default = formats.${cfg.format.type}.package;
description = "Bash formatter package";
};
};
extraDiagnostics = {
@ -108,9 +102,14 @@ in {
(mkIf cfg.format.enable {
vim.formatter.conform-nvim = {
enable = true;
setupOpts.formatters_by_ft.sh = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = {
command = getExe cfg.format.package;
setupOpts = {
formatters_by_ft.sh = cfg.format.type;
formatters =
mapListToAttrs (name: {
inherit name;
value = formats.${name};
})
cfg.format.type;
};
};
})