mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-04-26 19:37:36 +00:00
languages/csharp: add csharpier formatter and assertions
This commit is contained in:
parent
1628aa93b7
commit
e60803d9d6
2 changed files with 61 additions and 11 deletions
|
|
@ -494,6 +494,7 @@ https://github.com/gorbit99/codewindow.nvim
|
||||||
[CaueAnjos](https://github.com/caueanjos)
|
[CaueAnjos](https://github.com/caueanjos)
|
||||||
|
|
||||||
- Added razor support for `roslyn_ls` and `csharp_ls`
|
- Added razor support for `roslyn_ls` and `csharp_ls`
|
||||||
|
- Added `csharpier` formatter to csharp language
|
||||||
|
|
||||||
[mputz86](https://github.com/mputz86)
|
[mputz86](https://github.com/mputz86)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
options,
|
options,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (builtins) elem;
|
inherit (builtins) elem filter attrNames;
|
||||||
inherit (lib) genAttrs;
|
inherit (lib) genAttrs getExe;
|
||||||
inherit (lib.generators) mkLuaInline;
|
inherit (lib.generators) mkLuaInline;
|
||||||
inherit (lib.options) mkEnableOption mkOption literalExpression;
|
inherit (lib.options) mkEnableOption mkOption literalExpression;
|
||||||
inherit (config.vim.lib) mkMappingOption;
|
inherit (config.vim.lib) mkMappingOption;
|
||||||
|
|
@ -16,10 +16,26 @@
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (lib.nvim.dag) entryAnywhere;
|
inherit (lib.nvim.dag) entryAnywhere;
|
||||||
inherit (lib.nvim.binds) addDescriptionsToMappings;
|
inherit (lib.nvim.binds) addDescriptionsToMappings;
|
||||||
|
inherit (lib.nvim.attrsets) mapListToAttrs;
|
||||||
|
|
||||||
defaultServers = ["csharp_ls"];
|
defaultServers = ["csharp_ls"];
|
||||||
servers = ["csharp_ls" "omnisharp" "roslyn-ls"];
|
servers = ["csharp_ls" "omnisharp" "roslyn-ls"];
|
||||||
|
|
||||||
|
defaultFormat = [];
|
||||||
|
formats = {
|
||||||
|
csharpier = {
|
||||||
|
command = getExe pkgs.csharpier;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Verbose names for clarity.
|
||||||
|
shouldEnableExclusiveLspExtension = extension: lsp: cfg.lsp.enable && cfg.extensions.${extension}.enable && (elem lsp cfg.lsp.servers);
|
||||||
|
mkAlertForMisuseOfExclusiveLspExtension = extension: lsp: (mkIf (cfg.lsp.enable
|
||||||
|
&& cfg.extensions.${extension}.enable) {
|
||||||
|
assertion = elem lsp cfg.lsp.servers;
|
||||||
|
message = "${extension} requires ${lsp} to be listed in vim.languages.csharp.lsp.servers.";
|
||||||
|
});
|
||||||
|
|
||||||
cfg = config.vim.languages.csharp;
|
cfg = config.vim.languages.csharp;
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
|
|
@ -151,6 +167,21 @@ in {
|
||||||
default = defaultServers;
|
default = defaultServers;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
format = {
|
||||||
|
enable =
|
||||||
|
mkEnableOption "C# formatting"
|
||||||
|
// {
|
||||||
|
default = config.vim.languages.enableFormat;
|
||||||
|
defaultText = literalExpression "config.vim.languages.enableFormat";
|
||||||
|
};
|
||||||
|
|
||||||
|
type = mkOption {
|
||||||
|
description = "C# formatter to use";
|
||||||
|
type = listOf (enum (attrNames formats));
|
||||||
|
default = defaultFormat;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -179,9 +210,31 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(mkIf (cfg.lsp.enable
|
|
||||||
&& cfg.extensions.roslyn-nvim.enable
|
(mkIf cfg.format.enable {
|
||||||
&& (elem "roslyn-ls" cfg.lsp.servers)) {
|
vim.formatter.conform-nvim = {
|
||||||
|
enable = true;
|
||||||
|
setupOpts = {
|
||||||
|
formatters_by_ft.cs = cfg.format.type;
|
||||||
|
formatters =
|
||||||
|
mapListToAttrs (name: {
|
||||||
|
inherit name;
|
||||||
|
value = formats.${name};
|
||||||
|
})
|
||||||
|
(filter (name: name != "lsp") cfg.format.type);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
{
|
||||||
|
assertions = [
|
||||||
|
(mkAlertForMisuseOfExclusiveLspExtension "roslyn-nvim" "roslyn-ls")
|
||||||
|
(mkAlertForMisuseOfExclusiveLspExtension "csharpls-extended-lsp-nvim" "csharp_ls")
|
||||||
|
(mkAlertForMisuseOfExclusiveLspExtension "omnisharp-extended-lsp-nvim" "omnisharp")
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
(mkIf (shouldEnableExclusiveLspExtension "roslyn-nvim" "roslyn-ls") {
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["roslyn-nvim"];
|
startPlugins = ["roslyn-nvim"];
|
||||||
pluginRC.roslyn-nvim = entryAnywhere "require('roslyn').setup(${toLuaObject cfg.extensions.roslyn-nvim.setupOpts})";
|
pluginRC.roslyn-nvim = entryAnywhere "require('roslyn').setup(${toLuaObject cfg.extensions.roslyn-nvim.setupOpts})";
|
||||||
|
|
@ -189,9 +242,7 @@ in {
|
||||||
extraPackages = with pkgs; [roslyn-ls];
|
extraPackages = with pkgs; [roslyn-ls];
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(mkIf (cfg.lsp.enable
|
(mkIf (shouldEnableExclusiveLspExtension "omnisharp-extended-lsp-nvim" "omnisharp") {
|
||||||
&& cfg.extensions.omnisharp-extended-lsp-nvim.enable
|
|
||||||
&& (elem "omnisharp" cfg.lsp.servers)) {
|
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["omnisharp-extended-lsp-nvim"];
|
startPlugins = ["omnisharp-extended-lsp-nvim"];
|
||||||
lsp.servers.omnisharp.on_attach = let
|
lsp.servers.omnisharp.on_attach = let
|
||||||
|
|
@ -213,9 +264,7 @@ in {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
(mkIf (cfg.lsp.enable
|
(mkIf (shouldEnableExclusiveLspExtension "csharpls-extended-lsp-nvim" "csharp_ls") {
|
||||||
&& cfg.extensions.csharpls-extended-lsp-nvim.enable
|
|
||||||
&& (elem "csharp_ls" cfg.lsp.servers)) {
|
|
||||||
vim = {
|
vim = {
|
||||||
startPlugins = ["csharpls-extended-lsp-nvim"];
|
startPlugins = ["csharpls-extended-lsp-nvim"];
|
||||||
lsp.servers.csharp_ls.on_attach = mkLuaInline ''
|
lsp.servers.csharp_ls.on_attach = mkLuaInline ''
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue