NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-09 12:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/typescript: rename languages/ts to languages/typescript and cleanup the module

Browse source
This commit is contained in:
Snoweuph 2026-03-27 22:25:21 +01:00
commit b696380799
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
5 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configuration.nix
View file

@ -65,7 +65,7 @@ isMaximal: {
sql.enable = isMaximal; sql.enable = isMaximal;
java.enable = isMaximal; java.enable = isMaximal;
kotlin.enable = isMaximal; kotlin.enable = isMaximal;
ts.enable = isMaximal; typescript.enable = isMaximal;
go.enable = isMaximal; go.enable = isMaximal;
lua.enable = isMaximal; lua.enable = isMaximal;
zig.enable = isMaximal; zig.enable = isMaximal;

2
docs/manual/release-notes/rl-0.9.md
View file

@ -63,6 +63,8 @@
- Added `json5` into `languages.json`. Some options where renamed. - Added `json5` into `languages.json`. Some options where renamed.
- Renamed `languages.ts` to `languages.typescript`.
## Changelog {#sec-release-0-9-changelog} ## Changelog {#sec-release-0-9-changelog}
[SecBear](https://github.com/SecBear): [SecBear](https://github.com/SecBear):

4
modules/extra/deprecations.nix
View file

@ -247,8 +247,8 @@ in {
(mkRemovedLspPackage "terraform") (mkRemovedLspPackage "terraform")
(mkRenamedLspServer "ts") (mkRenamedLspServer "typescript")
(mkRemovedLspPackage "ts") (mkRemovedLspPackage "typescript")
(mkRenamedLspServer "typst") (mkRenamedLspServer "typst")
(mkRemovedLspPackage "typst") (mkRemovedLspPackage "typst")

2
modules/plugins/languages/default.nix
View file

@ -48,7 +48,7 @@ in {
./tailwind.nix ./tailwind.nix
./terraform.nix ./terraform.nix
./toml.nix ./toml.nix
./ts.nix ./typescript.nix
./typst.nix ./typst.nix
./zig.nix ./zig.nix
./csharp.nix ./csharp.nix

16
modules/plugins/languages/ts.nix → modules/plugins/languages/typescript.nix
View file

@ -8,14 +8,14 @@
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum package bool; inherit (lib.types) enum bool listOf;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.lua) toLuaObject; 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; inherit (lib.nvim.dag) entryAnywhere entryBefore;
cfg = config.vim.languages.ts; cfg = config.vim.languages.typescript;
defaultServers = ["ts_ls"]; defaultServers = ["ts_ls"];
servers = let servers = let
@ -239,8 +239,8 @@
}; };
}; };
in { in {
_file = ./ts.nix; _file = ./typescript.nix;
options.vim.languages.ts = { options.vim.languages.typescript = {
enable = mkEnableOption "Typescript/Javascript language support"; enable = mkEnableOption "Typescript/Javascript language support";
treesitter = { treesitter = {
@ -264,7 +264,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.ts.lsp.servers" (enum (attrNames servers)); type = listOf (enum (attrNames servers));
default = defaultServers; default = defaultServers;
description = "Typescript/Javascript LSP server to use"; description = "Typescript/Javascript LSP server to use";
}; };
@ -280,7 +280,7 @@ in {
type = mkOption { type = mkOption {
description = "Typescript/Javascript formatter to use"; description = "Typescript/Javascript formatter to use";
type = deprecatedSingleOrListOf "vim.language.ts.format.type" (enum (attrNames formats)); type = listOf (enum (attrNames formats));
default = defaultFormat; default = defaultFormat;
}; };
}; };
@ -390,7 +390,7 @@ in {
message = '' message = ''
As of a recent lspconfig update, the `tsserver` configuration has been renamed 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` 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}` to `"ts_ls"` instead of to `${cfg.lsp.server}`
Please see <https://github.com/neovim/nvim-lspconfig/pull/3232> for more details Please see <https://github.com/neovim/nvim-lspconfig/pull/3232> for more details