diff --git a/configuration.nix b/configuration.nix index 2c687794..146569e2 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.9.md b/docs/manual/release-notes/rl-0.9.md index 2eeca8f9..e28fd58c 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -63,6 +63,8 @@ - Added `json5` into `languages.json`. Some options where renamed. +- 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 1572f249..dfff38ab 100644 --- a/modules/extra/deprecations.nix +++ b/modules/extra/deprecations.nix @@ -247,8 +247,8 @@ in { (mkRemovedLspPackage "terraform") - (mkRenamedLspServer "ts") - (mkRemovedLspPackage "ts") + (mkRenamedLspServer "typescript") + (mkRemovedLspPackage "typescript") (mkRenamedLspServer "typst") (mkRemovedLspPackage "typst") diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 3f779dbb..d69772ee 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -48,7 +48,7 @@ in { ./tailwind.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 c3e162e0..823c5594 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/typescript.nix @@ -8,14 +8,14 @@ inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; - inherit (lib.types) enum package bool; + inherit (lib.types) enum bool listOf; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption deprecatedSingleOrListOf; + inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption; inherit (lib.nvim.dag) entryAnywhere entryBefore; - cfg = config.vim.languages.ts; + cfg = config.vim.languages.typescript; defaultServers = ["ts_ls"]; servers = let @@ -239,8 +239,8 @@ }; }; in { - _file = ./ts.nix; - options.vim.languages.ts = { + _file = ./typescript.nix; + options.vim.languages.typescript = { enable = mkEnableOption "Typescript/Javascript language support"; treesitter = { @@ -264,7 +264,7 @@ in { }; servers = mkOption { - type = deprecatedSingleOrListOf "vim.language.ts.lsp.servers" (enum (attrNames servers)); + type = listOf (enum (attrNames servers)); default = defaultServers; description = "Typescript/Javascript LSP server to use"; }; @@ -280,7 +280,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; }; }; @@ -390,7 +390,7 @@ in { message = '' As of a recent lspconfig update, the `tsserver` configuration has been renamed to `ts_ls` to match upstream behaviour of `lspconfig`, and the name `tsserver` - is no longer considered valid by nvf. Please set `vim.languages.ts.lsp.server` + is no longer considered valid by nvf. Please set `vim.languages.typescript.lsp.server` to `"ts_ls"` instead of to `${cfg.lsp.server}` Please see for more details