NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 10:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/ts: convert module

Browse source
This commit is contained in:
poz 2025-07-21 13:03:08 +02:00
commit de55ee55ce
No known key found for this signature in database
1 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

114
modules/plugins/languages/ts.nix
View file

@ -5,69 +5,68 @@
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.generators) mkLuaInline;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) elem;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum either listOf package str bool; inherit (lib.types) enum package bool;
inherit (lib.nvim.lua) expToLua toLuaObject; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption; inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption mkServersOption;
inherit (lib.nvim.dag) entryAnywhere entryBefore;
cfg = config.vim.languages.ts; cfg = config.vim.languages.ts;
defaultServer = "ts_ls"; defaultServers = ["ts_ls"];
servers = { servers = {
ts_ls = { ts_ls = {
package = pkgs.typescript-language-server; enable = true;
lspConfig = '' cmd = [(getExe pkgs.typescript-language-server) "--stdio"];
lspconfig.ts_ls.setup { filetypes = ["javascript" "javascriptreact" "javascript.jsx" "typescript" "typescriptreact" "typescript.tsx"];
capabilities = capabilities, root_markers = ["tsconfig.json" "jsconfig.json" "package.json" ".git"];
on_attach = function(client, bufnr) on_attach =
mkLuaInline
/*
lua
*/
''
function(client, bufnr)
attach_keymaps(client, bufnr); attach_keymaps(client, bufnr);
client.server_capabilities.documentFormattingProvider = false; client.server_capabilities.documentFormattingProvider = false;
end, end
cmd = ${
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else ''{"${cfg.lsp.package}/bin/typescript-language-server", "--stdio"}''
}
}
''; '';
}; };
denols = { denols = {
enable = true;
cmd = [(getExe pkgs.deno) "lsp"];
package = pkgs.deno; package = pkgs.deno;
lspConfig = '' filetypes = ["javascript" "javascriptreact" "javascript.jsx" "typescript" "typescriptreact" "typescript.tsx"];
vim.g.markdown_fenced_languages = { "ts=typescript" } root_markers = ["tsconfig.json" "jsconfig.json" "package.json" ".git"];
lspconfig.denols.setup { on_attach =
capabilities = capabilities; mkLuaInline
on_attach = attach_keymaps, /*
cmd = ${ lua
if isList cfg.lsp.package */
then expToLua cfg.lsp.package "attach_keymaps";
else ''{"${cfg.lsp.package}/bin/deno", "lsp"}''
}
}
'';
}; };
# Here for backwards compatibility. Still consider tsserver a valid # Here for backwards compatibility. Still consider tsserver a valid
# configuration in the enum, but assert if it's set to *properly* # configuration in the enum, but assert if it's set to *properly*
# redirect the user to the correct server. # redirect the user to the correct server.
tsserver = { tsserver = {
enable = true;
cmd = [(getExe pkgs.typescript-language-server) "--stdio"];
package = pkgs.typescript-language-server; package = pkgs.typescript-language-server;
lspConfig = '' filetypes = ["javascript" "javascriptreact" "javascript.jsx" "typescript" "typescriptreact" "typescript.tsx"];
lspconfig.ts_ls.setup { root_markers = ["tsconfig.json" "jsconfig.json" "package.json" ".git"];
capabilities = capabilities; on_attach =
on_attach = attach_keymaps, mkLuaInline
cmd = ${ /*
if isList cfg.lsp.package lua
then expToLua cfg.lsp.package */
else ''{"${cfg.lsp.package}/bin/typescript-language-server", "--stdio"}'' "attach_keymaps";
}
}
'';
}; };
}; };
@ -121,19 +120,7 @@ in {
lsp = { lsp = {
enable = mkEnableOption "Typescript/Javascript LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Typescript/Javascript LSP support" // {default = config.vim.lsp.enable;};
servers = mkServersOption "Typescript/Javascript" servers defaultServers;
server = mkOption {
description = "Typescript/Javascript LSP server to use";
type = enum (attrNames servers);
default = defaultServer;
};
package = mkOption {
description = "Typescript/Javascript LSP server package, or the command to run as a list of strings";
example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
};
}; };
format = { format = {
@ -190,8 +177,23 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.ts-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
})
(mkIf (cfg.lsp.enable && elem "denols" cfg.lsp.servers) {
vim.luaConfigRC.denols =
entryBefore ["lsp-servers"]
/*
lua
*/
''
vim.g.markdown_fenced_languages = { "ts=typescript" }
'';
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {