convert dart module

This commit is contained in:
sjcobb 2025-06-05 09:45:50 +01:00
commit e970eac1af

View file

@ -6,6 +6,7 @@
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib.trivial) boolToString; inherit (lib.trivial) boolToString;
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
@ -14,26 +15,31 @@
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.dag) entryAfter;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.dart; cfg = config.vim.languages.dart;
ftcfg = cfg.flutter-tools; ftcfg = cfg.flutter-tools;
defaultServer = "dart"; defaultServers = ["dart"];
servers = { servers = {
dart = { dart = {
package = pkgs.dart; enable = true;
lspConfig = '' cmd = [(getExe pkgs.dart) "language-server" "--protocol=lsp"];
lspconfig.dartls.setup{ filetypes = ["dart"];
capabilities = capabilities; root_markers = ["pubspec.yaml"];
on_attach=default_on_attach; init_options = {
cmd = ${ onlyAnalyzeProjectsWithOpenFiles = true;
if isList cfg.lsp.package suggestFromUnimportedLibraries = true;
then expToLua cfg.lsp.package closingLabels = true;
else ''{"${cfg.lsp.package}/bin/dart", "language-server", "--protocol=lsp"}'' outline = true;
flutterOutline = true;
};
settings = {
dart = {
completeFunctionCalls = true;
showTodos = true;
};
}; };
${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
}
'';
}; };
}; };
in { in {
@ -46,23 +52,11 @@ in {
}; };
lsp = { lsp = {
enable = mkEnableOption "Dart LSP support"; enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;};
server = mkOption { servers = mkOption {
description = "The Dart LSP server to use"; description = "Dart LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
};
package = mkOption {
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
description = "Dart LSP server package, or the command to run as a list of strings";
};
opts = mkOption {
type = nullOr str;
default = null;
description = "Options to pass to Dart LSP server";
}; };
}; };
@ -131,19 +125,23 @@ in {
}; };
}; };
config.vim = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {
treesitter.enable = true; vim.treesitter.enable = true;
treesitter.grammars = [cfg.treesitter.package]; vim.treesitter.grammars = [cfg.treesitter.package];
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
lsp.lspconfig.enable = true; vim.lsp.servers =
lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
(mkIf ftcfg.enable { (mkIf ftcfg.enable {
startPlugins = [ vim.startPlugins = [
( (
if ftcfg.enableNoResolvePatch if ftcfg.enableNoResolvePatch
then "flutter-tools-patched" then "flutter-tools-patched"
@ -152,7 +150,7 @@ in {
"plenary-nvim" "plenary-nvim"
]; ];
pluginRC.flutter-tools = entryAfter ["lsp-setup"] '' vim.pluginRC.flutter-tools = entryAfter ["lsp-servers"] ''
require('flutter-tools').setup { require('flutter-tools').setup {
${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","} ${optionalString (ftcfg.flutterPackage != null) "flutter_path = \"${ftcfg.flutterPackage}/bin/flutter\","}
lsp = { lsp = {