NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 20:05:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/r: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-11 17:08:47 +02:00
commit 60a69abead
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/manual/release-notes/rl-0.9.md
View file

@ -83,6 +83,8 @@
- Renamed `ruby_lsp` to `ruby-lsp`. - Renamed `ruby_lsp` to `ruby-lsp`.
- Renamed `r_language_server` to `r-languageserver`.
- Removed `languages.tailwind` which only provided an LSP. Use - Removed `languages.tailwind` which only provided an LSP. Use
`lsp.presets.tailwindcss-language-server` instead. `lsp.presets.tailwindcss-language-server` instead.

38
modules/plugins/languages/r.nix
View file

@ -7,18 +7,13 @@
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum; inherit (lib.types) enum listOf;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline;
cfg = config.vim.languages.r; cfg = config.vim.languages.r;
r-with-languageserver = pkgs.rWrapper.override {
packages = [pkgs.rPackages.languageserver];
};
defaultFormat = ["format_r"]; defaultFormat = ["format_r"];
formats = { formats = {
styler = { styler = {
@ -47,19 +42,8 @@
}; };
}; };
defaultServers = ["r_language_server"]; defaultServers = ["r-languageserver"];
servers = { servers = ["r-languageserver"];
r_language_server = {
enable = true;
cmd = [(getExe r-with-languageserver) "--no-echo" "-e" "languageserver::run()"];
filetypes = ["r" "rmd" "quarto"];
root_dir = mkLuaInline ''
function(bufnr, on_dir)
on_dir(vim.fs.root(bufnr, '.git') or vim.uv.os_homedir())
end
'';
};
};
in { in {
options.vim.languages.r = { options.vim.languages.r = {
enable = mkEnableOption "R language support"; enable = mkEnableOption "R language support";
@ -83,7 +67,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.r.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "R LSP server to use"; description = "R LSP server to use";
}; };
@ -127,12 +111,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; filetypes = ["r" "rmd" "quarto"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }