languages/fsharp: convert module

This commit is contained in:
poz 2025-07-21 12:33:25 +02:00
commit 43bbd6c721
No known key found for this signature in database

View file

@ -5,29 +5,30 @@
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.generators) mkLuaInline;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) either listOf package str enum; inherit (lib.types) package enum;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption mkServersOption;
inherit (lib.nvim.lua) expToLua;
defaultServer = "fsautocomplete"; defaultServers = ["fsautocomplete"];
servers = { servers = {
fsautocomplete = { fsautocomplete = {
package = pkgs.fsautocomplete; enable = true;
internalFormatter = false; cmd = [(getExe pkgs.fsautocomplete)];
lspConfig = '' filetypes = ["fsharp"];
lspconfig.fsautocomplete.setup { root_dir =
capabilities = capabilities; mkLuaInline
on_attach = default_on_attach; /*
cmd = ${ lua
if isList cfg.lsp.package */
then expToLua cfg.lsp.package ''
else "{'${cfg.lsp.package}/bin/fsautocomplete'}" function(bufnr, on_dir)
}, local fname = vim.api.nvim_buf_get_name(bufnr)
} on_dir(util.root_pattern('*.sln', '*.fsproj', '.git')(fname))
end,
''; '';
}; };
}; };
@ -52,19 +53,9 @@ in {
lsp = { lsp = {
enable = mkEnableOption "F# LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "F# LSP support" // {default = config.vim.lsp.enable;};
server = mkOption { servers = mkServersOption "F#" servers defaultServers;
type = enum (attrNames servers);
default = defaultServer;
description = "F# LSP server to use";
}; };
package = mkOption {
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
example = ''[lib.getExe pkgs.fsautocomplete "--state-directory" "~/.cache/fsautocomplete"]'';
description = "F# LSP server package, or the command to run as a list of strings";
};
};
format = { format = {
enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;}; enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;};
@ -90,8 +81,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.fsharp-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {