From 4b4deecc6c3b20aa9e79a7bbcf080b1910a112d7 Mon Sep 17 00:00:00 2001 From: poz Date: Mon, 21 Jul 2025 12:57:29 +0200 Subject: [PATCH] languages/svelte: rename treesitter.sveltePackage to package --- modules/plugins/languages/svelte.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index b5f5adff..76154220 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -6,7 +6,7 @@ }: let inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; - inherit (lib.modules) mkIf mkMerge; + inherit (lib.modules) mkIf mkMerge mkRemovedOptionModule; inherit (lib.meta) getExe; inherit (lib.types) enum package; inherit (lib.nvim.types) mkGrammarOption mkServersOption diagnostics; @@ -77,13 +77,16 @@ }; }; in { + imports = [ + (mkRemovedOptionModule ["vim" "languages" "svelte" "treesitter" "sveltePackage"] "renamed to `vim.languages.svelte.treesitter.package`") + ]; + options.vim.languages.svelte = { enable = mkEnableOption "Svelte language support"; treesitter = { enable = mkEnableOption "Svelte treesitter" // {default = config.vim.languages.enableTreesitter;}; - - sveltePackage = mkGrammarOption pkgs "svelte"; + package = mkGrammarOption pkgs "svelte"; }; lsp = { @@ -121,7 +124,7 @@ in { config = mkIf cfg.enable (mkMerge [ (mkIf cfg.treesitter.enable { vim.treesitter.enable = true; - vim.treesitter.grammars = [cfg.treesitter.sveltePackage]; + vim.treesitter.grammars = [cfg.treesitter.package]; }) (mkIf cfg.lsp.enable {