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

4
modules/extra/deprecations.nix
View file

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

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

@ -48,7 +48,7 @@ in {
./tailwind.nix
./terraform.nix
./toml.nix
./ts.nix
./typescript.nix
./typst.nix
./zig.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.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 <https://github.com/neovim/nvim-lspconfig/pull/3232> for more details