convert svelte module

This commit is contained in:
sjcobb 2025-07-11 14:05:16 +01:00
commit 632e60736f

View file

@ -7,28 +7,39 @@
inherit (builtins) attrNames; inherit (builtins) attrNames;
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.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.types) enum either listOf package str; inherit (lib.types) enum listOf package;
inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.types) mkGrammarOption diagnostics; inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline;
cfg = config.vim.languages.svelte; cfg = config.vim.languages.svelte;
defaultServer = "svelte"; defaultServers = ["svelte"];
servers = { servers = {
svelte = { svelte = {
package = pkgs.svelte-language-server; enable = true;
lspConfig = '' cmd = [(getExe pkgs.svelte-language-server) "--stdio"];
lspconfig.svelte.setup { filetypes = ["svelte"];
capabilities = capabilities; root_dir = mkLuaInline ''
on_attach = attach_keymaps, function(bufnr, on_dir)
cmd = ${ local root_files = { 'package.json', '.git' }
if isList cfg.lsp.package local fname = vim.api.nvim_buf_get_name(bufnr)
then expToLua cfg.lsp.package -- Svelte LSP only supports file:// schema. https://github.com/sveltejs/language-tools/issues/2777
else ''{"${cfg.lsp.package}/bin/svelteserver", "--stdio"}'' if vim.uv.fs_stat(fname) ~= nil then
} on_dir(vim.fs.dirname(vim.fs.find(root_files, { path = fname, upward = true })[1]))
} end
end
'';
on_attach = mkLuaInline ''
function(client, bufnr)
vim.api.nvim_buf_create_user_command(bufnr, 'LspMigrateToSvelte5', function()
client:exec_cmd({
command = 'migrate_to_svelte_5',
arguments = { vim.uri_from_bufnr(bufnr) },
})
end, { desc = 'Migrate Component to Svelte 5 Syntax' })
end
''; '';
}; };
}; };
@ -78,17 +89,10 @@ in {
lsp = { lsp = {
enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;};
server = mkOption { servers = mkOption {
description = "Svelte LSP server to use"; description = "Svelte LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
};
package = mkOption {
description = "Svelte 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;
}; };
}; };
@ -126,8 +130,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.svelte-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {