NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-08 22:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

language/svelte: fix prettier, remove prettierd

Browse source
This commit is contained in:
Ching Pei Yang 2025-08-23 20:04:28 +02:00
commit 266f5bc01f
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/plugins/languages/svelte.nix
View file

@ -1,4 +1,5 @@
{ {
self,
config, config,
pkgs, pkgs,
lib, lib,
@ -8,7 +9,7 @@
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum package; inherit (lib.types) enum package coercedTo;
inherit (lib.nvim.types) mkGrammarOption diagnostics singleOrListOf; inherit (lib.nvim.types) mkGrammarOption diagnostics singleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
@ -53,15 +54,19 @@
}; };
}; };
# TODO: specify packages defaultFormat = ["prettier"];
defaultFormat = "prettier"; formats = let
formats = { prettierPlugin = self.packages.${pkgs.stdenv.system}.prettier-plugin-svelte;
prettierPluginPath = "${prettierPlugin}/lib/node_modules/prettier-plugin-svelte/plugin.js";
in {
prettier = { prettier = {
package = pkgs.prettier; command = getExe pkgs.nodePackages.prettier;
options.ft_parsers.svelte = "svelte";
prepend_args = ["--plugin=${prettierPluginPath}"];
}; };
biome = { biome = {
package = pkgs.biome; command = getExe pkgs.biome;
}; };
}; };
@ -85,6 +90,15 @@
}; };
}; };
}; };
formatType =
singleOrListOf
"vim.languages.svelte.format.type"
(coercedTo (enum ["prettierd"]) (_:
lib.warn
"vim.languages.svelte.format.type: prettierd is deprecated, use prettier instead"
"prettier")
(enum (attrNames formats)));
in { in {
options.vim.languages.svelte = { options.vim.languages.svelte = {
enable = mkEnableOption "Svelte language support"; enable = mkEnableOption "Svelte language support";
@ -109,7 +123,7 @@ in {
enable = mkEnableOption "Svelte formatting" // {default = config.vim.languages.enableFormat;}; enable = mkEnableOption "Svelte formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption { type = mkOption {
type = enum (attrNames formats); type = formatType;
default = defaultFormat; default = defaultFormat;
description = "Svelte formatter to use"; description = "Svelte formatter to use";
}; };
@ -150,9 +164,14 @@ in {
(mkIf cfg.format.enable { (mkIf cfg.format.enable {
vim.formatter.conform-nvim = { vim.formatter.conform-nvim = {
enable = true; enable = true;
setupOpts.formatters_by_ft.svelte = [cfg.format.type]; setupOpts = {
setupOpts.formatters.${cfg.format.type} = { formatters_by_ft.svelte = cfg.format.type;
command = getExe cfg.format.package; formatters =
mapListToAttrs (name: {
inherit name;
value = formats.${name};
})
cfg.format.type;
}; };
}; };
}) })