diff --git a/configuration.nix b/configuration.nix index 33b9f119..9155d427 100644 --- a/configuration.nix +++ b/configuration.nix @@ -65,7 +65,7 @@ isMaximal: { sql.enable = isMaximal; java.enable = isMaximal; kotlin.enable = isMaximal; - ts.enable = isMaximal; + typescript.enable = isMaximal; go.enable = isMaximal; lua.enable = isMaximal; zig.enable = isMaximal; diff --git a/docs/manual/release-notes/rl-0.7.md b/docs/manual/release-notes/rl-0.7.md index 098d77ac..a9065c60 100644 --- a/docs/manual/release-notes/rl-0.7.md +++ b/docs/manual/release-notes/rl-0.7.md @@ -375,7 +375,7 @@ The changes are, in no particular order: [nezia1](https://github.com/nezia1): - Add [biome](https://github.com/biomejs/biome) support for Typescript, CSS and - Svelte. Enable them via {option}`vim.languages.ts.format.type`, + Svelte. Enable them via {option}`vim.languages.typescript.format.type`, {option}`vim.languages.css.format.type` and {option}`vim.languages.svelte.format.type` respectively. - Replace [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) with diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 4e9153c5..35afc9f9 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -102,6 +102,8 @@ - Removed `languages.tailwind` which only provided an LSP. Use `lsp.presets.tailwindcss-language-server` instead. +- Renamed `languages.ts` to `languages.typescript`. + ## Changelog {#sec-release-0-9-changelog} [SecBear](https://github.com/SecBear): diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix index 3edd23c8..31d0995d 100644 --- a/modules/extra/deprecations.nix +++ b/modules/extra/deprecations.nix @@ -244,8 +244,8 @@ in { (mkRemovedLspPackage "terraform") - (mkRenamedLspServer "ts") - (mkRemovedLspPackage "ts") + (mkRenamedLspServer "typescript") + (mkRemovedLspPackage "typescript") (mkRenamedLspServer "typst") (mkRemovedLspPackage "typst") @@ -300,7 +300,7 @@ in { "ruby" "rust" "sql" - "ts" + "typescript" "typst" ]) # Migrated via batchRenameOptions. Further batch renames must be below this line. @@ -345,7 +345,7 @@ in { (mkRenamedOptionModule ["vim" "treesitter" "foldByDefault"] ["vim" "options" "foldenable"]) ] - # 2026-13-04 + # 2026-04-13 [ (mkRenamedOptionModule ["vim" "lsp" "harper-ls" "enable"] ["vim" "lsp" "presets" "harper" "enable"]) (mkRenamedOptionModule ["vim" "lsp" "harper-ls" "settings"] ["vim" "lsp" "servers" "harper" "settings"]) @@ -353,5 +353,10 @@ in { (mkRenamedOptionModule ["vim" "languages" "tailwind" "lsp" "enable"] ["vim" "lsp" "presets" "tailwindcss-language-server" "enable"]) (mkRenamedOptionModule ["vim" "languages" "tailwind" "lsp" "servers"] ["vim" "lsp" "presets" "tailwindcss-language-server" "enable"]) ] + + # 2026-04-16 + [ + (mkRenamedOptionModule ["vim" "languages" "ts"] ["vim" "languages" "typescript"]) + ] ]; } diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 16db0aab..f85c9701 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -47,7 +47,7 @@ in { ./svelte.nix ./terraform.nix ./toml.nix - ./ts.nix + ./typescript.nix ./typst.nix ./zig.nix ./csharp.nix diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/typescript.nix similarity index 96% rename from modules/plugins/languages/ts.nix rename to modules/plugins/languages/typescript.nix index 8d170236..3af413a2 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/typescript.nix @@ -12,10 +12,10 @@ inherit (lib.types) enum bool listOf; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption deprecatedSingleOrListOf enumWithRename; + inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption enumWithRename; inherit (lib.nvim.dag) entryAnywhere; - cfg = config.vim.languages.ts; + cfg = config.vim.languages.typescript; defaultServers = ["typescript-language-server"]; servers = ["typescript-language-server" "deno" "typescript-go"]; @@ -74,8 +74,7 @@ }; }; in { - _file = ./ts.nix; - options.vim.languages.ts = { + options.vim.languages.typescript = { enable = mkEnableOption "Typescript/Javascript language support"; treesitter = { @@ -122,7 +121,7 @@ in { type = mkOption { description = "Typescript/Javascript formatter to use"; - type = deprecatedSingleOrListOf "vim.language.ts.format.type" (enum (attrNames formats)); + type = listOf (enum (attrNames formats)); default = defaultFormat; }; };