languages/svelte: rename treesitter.sveltePackage to package

This commit is contained in:
poz 2025-07-21 12:57:29 +02:00
commit 4b4deecc6c
No known key found for this signature in database

View file

@ -6,7 +6,7 @@
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge mkRemovedOptionModule;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum package; inherit (lib.types) enum package;
inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics;
@ -77,13 +77,16 @@
}; };
}; };
in { in {
imports = [
(mkRemovedOptionModule ["vim" "languages" "svelte" "treesitter" "sveltePackage"] "renamed to `vim.languages.svelte.treesitter.package`")
];
options.vim.languages.svelte = { options.vim.languages.svelte = {
enable = mkEnableOption "Svelte language support"; enable = mkEnableOption "Svelte language support";
treesitter = { treesitter = {
enable = mkEnableOption "Svelte treesitter" // {default = config.vim.languages.enableTreesitter;}; enable = mkEnableOption "Svelte treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "svelte";
sveltePackage = mkGrammarOption pkgs "svelte";
}; };
lsp = { lsp = {
@ -121,7 +124,7 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {
vim.treesitter.enable = true; vim.treesitter.enable = true;
vim.treesitter.grammars = [cfg.treesitter.sveltePackage]; vim.treesitter.grammars = [cfg.treesitter.package];
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {