NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-04-03 11:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

language/r: migrate to conform/nvim-lint

Browse source
This commit is contained in:
Ching Pei Yang 2025-03-28 11:09:20 +01:00
parent a5deffb890
commit 7cf9e5c0a6
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,28 +24,29 @@
package = pkgs.rWrapper.override { package = pkgs.rWrapper.override {
packages = [pkgs.rPackages.styler]; packages = [pkgs.rPackages.styler];
}; };
nullConfig = '' config = {
table.insert( command = "${cfg.format.package}/bin/R";
ls_sources, };
null_ls.builtins.formatting.styler.with({
command = "${cfg.format.package}/bin/R",
})
)
'';
}; };
format_r = { format_r = {
package = pkgs.rWrapper.override { package = pkgs.rWrapper.override {
packages = [pkgs.rPackages.formatR]; packages = [pkgs.rPackages.formatR];
}; };
nullConfig = '' config = {
table.insert( command = "${cfg.format.package}/bin/R";
ls_sources, stdin = true;
null_ls.builtins.formatting.format_r.with({ args = [
command = "${cfg.format.package}/bin/R", "--slave"
}) "--no-restore"
) "--no-save"
''; "-s"
"-e"
''formatR::tidy_source(source="stdin")''
];
# TODO: range_args seem to be possible
# https://github.com/nvimtools/none-ls.nvim/blob/main/lua/null-ls/builtins/formatting/format_r.lua
};
}; };
}; };
@ -118,8 +119,11 @@ in {
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {
vim.lsp.null-ls.enable = true; vim.formatter.conform-nvim = {
vim.lsp.null-ls.sources.r-format = formats.${cfg.format.type}.nullConfig; enable = true;
setupOpts.formatters_by_ft.r = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
};
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {