mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-01-07 11:17:15 +00:00
languages/csharp: add roslyn-ls support
It adds roslyn-ls configuration and roslyn-nvim plugin
This commit is contained in:
parent
45553196b3
commit
4cad097739
3 changed files with 88 additions and 58 deletions
|
|
@ -6,3 +6,9 @@
|
||||||
|
|
||||||
- Fix `vim.tabline.nvimBufferline` where `setupOpts.options.hover` requires
|
- Fix `vim.tabline.nvimBufferline` where `setupOpts.options.hover` requires
|
||||||
`vim.opt.mousemoveevent` to be set.
|
`vim.opt.mousemoveevent` to be set.
|
||||||
|
|
||||||
|
[CaueAnjos](https://github.com/CaueAnjos):
|
||||||
|
|
||||||
|
- Add razor support for C# language
|
||||||
|
- Breaking changes:
|
||||||
|
- `roslyn_ls` changed to `roslyn`
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,8 @@
|
||||||
in
|
in
|
||||||
optionalString (key != null) "vim.keymap.set('n', '${key}', ${action}, {buffer=bufnr, noremap=true, silent=true, desc='${desc}'})";
|
optionalString (key != null) "vim.keymap.set('n', '${key}', ${action}, {buffer=bufnr, noremap=true, silent=true, desc='${desc}'})";
|
||||||
|
|
||||||
# Omnisharp doesn't have colors in popup docs for some reason, and I've also
|
# roslyn is the official language server and the most feature-rich
|
||||||
# seen mentions of it being way slower, so until someone finds missing
|
defaultServers = ["roslyn"];
|
||||||
# functionality, this will be the default.
|
|
||||||
defaultServers = ["csharp_ls"];
|
|
||||||
servers = {
|
servers = {
|
||||||
omnisharp = {
|
omnisharp = {
|
||||||
cmd = mkLuaInline ''
|
cmd = mkLuaInline ''
|
||||||
|
|
@ -43,19 +41,7 @@
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
filetypes = ["cs" "vb"];
|
filetypes = ["cs" "vb"];
|
||||||
root_dir = mkLuaInline ''
|
root_marks = [".sln" ".csproj"];
|
||||||
function(bufnr, on_dir)
|
|
||||||
local function find_root_pattern(fname, lua_pattern)
|
|
||||||
return vim.fs.root(0, function(name, path)
|
|
||||||
return name:match(lua_pattern)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
local fname = vim.api.nvim_buf_get_name(bufnr)
|
|
||||||
on_dir(find_root_pattern(fname, "%.sln$") or find_root_pattern(fname, "%.csproj$"))
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
init_options = {};
|
|
||||||
capabilities = {
|
capabilities = {
|
||||||
workspace = {
|
workspace = {
|
||||||
workspaceFolders = false; # https://github.com/OmniSharp/omnisharp-roslyn/issues/909
|
workspaceFolders = false; # https://github.com/OmniSharp/omnisharp-roslyn/issues/909
|
||||||
|
|
@ -120,65 +106,65 @@
|
||||||
csharp_ls = {
|
csharp_ls = {
|
||||||
cmd = [(lib.getExe pkgs.csharp-ls)];
|
cmd = [(lib.getExe pkgs.csharp-ls)];
|
||||||
filetypes = ["cs"];
|
filetypes = ["cs"];
|
||||||
root_dir = mkLuaInline ''
|
root_marks = [".sln" ".csproj"];
|
||||||
function(bufnr, on_dir)
|
|
||||||
local function find_root_pattern(fname, lua_pattern)
|
|
||||||
return vim.fs.root(0, function(name, path)
|
|
||||||
return name:match(lua_pattern)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
local fname = vim.api.nvim_buf_get_name(bufnr)
|
|
||||||
on_dir(find_root_pattern(fname, "%.sln$") or find_root_pattern(fname, "%.csproj$"))
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
init_options = {
|
init_options = {
|
||||||
AutomaticWorkspaceInit = true;
|
AutomaticWorkspaceInit = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
roslyn_ls = {
|
roslyn = {
|
||||||
cmd = mkLuaInline ''
|
# NOTE: cmd is set by roslyn-nvim!
|
||||||
{
|
filetypes = ["cs" "razor" "cshtml"];
|
||||||
${toLuaObject (getExe pkgs.roslyn-ls)},
|
root_marks = [".sln" ".csproj"];
|
||||||
'--logLevel=Warning',
|
|
||||||
'--extensionLogDirectory=' .. vim.fs.dirname(vim.lsp.get_log_path()),
|
|
||||||
'--stdio',
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
|
|
||||||
filetypes = ["cs"];
|
|
||||||
root_dir = mkLuaInline ''
|
|
||||||
function(bufnr, on_dir)
|
|
||||||
local function find_root_pattern(fname, lua_pattern)
|
|
||||||
return vim.fs.root(0, function(name, path)
|
|
||||||
return name:match(lua_pattern)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
local fname = vim.api.nvim_buf_get_name(bufnr)
|
|
||||||
on_dir(find_root_pattern(fname, "%.sln$") or find_root_pattern(fname, "%.csproj$"))
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
init_options = {};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
extraServerPlugins = {
|
extraServerPlugins = {
|
||||||
omnisharp = ["omnisharp-extended-lsp-nvim"];
|
omnisharp = ["omnisharp-extended-lsp-nvim"];
|
||||||
csharp_ls = ["csharpls-extended-lsp-nvim"];
|
csharp_ls = ["csharpls-extended-lsp-nvim"];
|
||||||
roslyn_ls = [];
|
roslyn = ["roslyn-nvim"];
|
||||||
|
};
|
||||||
|
|
||||||
|
defaultRazorExtension = "vscode-csharp";
|
||||||
|
razorExtensions = let
|
||||||
|
packageExtension = pkg: path:
|
||||||
|
pkgs.stdenv.mkDerivation {
|
||||||
|
name = "${pkg.pname}_razor-extension";
|
||||||
|
inherit (pkg) version;
|
||||||
|
src = pkg;
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/packages/{roslyn,roslyn-unstable}/libexec
|
||||||
|
cp -r $src/${path} $out/packages/roslyn/libexec/.razorExtension
|
||||||
|
cp -r $src/${path} $out/packages/roslyn-unstable/libexec/.razorExtension
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
vscode-csharp =
|
||||||
|
packageExtension pkgs.vscode-extensions.ms-dotnettools.csharp "share/vscode/extensions/ms-dotnettools.csharp/.razorExtension";
|
||||||
};
|
};
|
||||||
|
|
||||||
cfg = config.vim.languages.csharp;
|
cfg = config.vim.languages.csharp;
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
vim.languages.csharp = {
|
vim.languages.csharp = {
|
||||||
enable = mkEnableOption "C# language support";
|
enable = mkEnableOption ''
|
||||||
|
C# language support.
|
||||||
|
|
||||||
|
::: {.note}
|
||||||
|
It's worth noting that this support will not work if the .NET SDK is not installed.
|
||||||
|
`roslyn` requires the .NET SDK 10 to work properly with Razor.
|
||||||
|
`csharp_ls` and `omnisharp` require the .NET SDK 9. I strongly recommend using the most recent version available.
|
||||||
|
:::
|
||||||
|
|
||||||
|
::: {.warning}
|
||||||
|
At the moment, only `roslyn` supports Razor.
|
||||||
|
:::
|
||||||
|
'';
|
||||||
|
|
||||||
treesitter = {
|
treesitter = {
|
||||||
enable = mkEnableOption "C# treesitter" // {default = config.vim.languages.enableTreesitter;};
|
enable = mkEnableOption "C#/razor treesitter" // {default = config.vim.languages.enableTreesitter;};
|
||||||
package = mkGrammarOption pkgs "c-sharp";
|
csPackage = mkGrammarOption pkgs "c-sharp";
|
||||||
|
razorPackage = mkGrammarOption pkgs "razor";
|
||||||
};
|
};
|
||||||
|
|
||||||
lsp = {
|
lsp = {
|
||||||
|
|
@ -188,6 +174,19 @@ in {
|
||||||
type = deprecatedSingleOrListOf "vim.language.csharp.lsp.servers" (enum (attrNames servers));
|
type = deprecatedSingleOrListOf "vim.language.csharp.lsp.servers" (enum (attrNames servers));
|
||||||
default = defaultServers;
|
default = defaultServers;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
razorExtension = mkOption {
|
||||||
|
description = ''
|
||||||
|
razor extensions package to use
|
||||||
|
|
||||||
|
::: {.warning}
|
||||||
|
At the moment, only `roslyn` supports Razor;
|
||||||
|
therefore, this option is effective only when `roslyn` is selected.
|
||||||
|
:::
|
||||||
|
'';
|
||||||
|
type = enum (attrNames razorExtensions);
|
||||||
|
default = defaultRazorExtension;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -195,11 +194,23 @@ in {
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
(mkIf cfg.treesitter.enable {
|
(mkIf cfg.treesitter.enable {
|
||||||
vim.treesitter.enable = true;
|
vim.treesitter.enable = true;
|
||||||
vim.treesitter.grammars = [cfg.treesitter.package];
|
vim.treesitter.grammars = [cfg.treesitter.csPackage cfg.treesitter.razorPackage];
|
||||||
|
})
|
||||||
|
|
||||||
|
(mkIf (cfg.lsp.enable && lib.elem "roslyn" cfg.lsp.servers)
|
||||||
|
{
|
||||||
|
vim.extraPackages = [pkgs.roslyn-ls pkgs.vscode-langservers-extracted];
|
||||||
|
|
||||||
|
# NOTE: roslyn-nvim requires razorExtension dll's
|
||||||
|
# See: https://github.com/seblyng/roslyn.nvim/blob/main/lua/roslyn/health.lua
|
||||||
|
vim.luaConfigRC.razorExtension = ''
|
||||||
|
vim.env.MASON = "${razorExtensions.${cfg.lsp.razorExtension}}"
|
||||||
|
'';
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf cfg.lsp.enable {
|
(mkIf cfg.lsp.enable {
|
||||||
vim.startPlugins = concatMap (server: extraServerPlugins.${server}) cfg.lsp.servers;
|
vim.startPlugins = concatMap (server: extraServerPlugins.${server}) cfg.lsp.servers;
|
||||||
|
|
||||||
vim.lsp.servers =
|
vim.lsp.servers =
|
||||||
mapListToAttrs (name: {
|
mapListToAttrs (name: {
|
||||||
inherit name;
|
inherit name;
|
||||||
|
|
|
||||||
|
|
@ -2373,6 +2373,19 @@
|
||||||
"url": "https://github.com/rose-pine/neovim/archive/72a04c4065345b51b56aed4859ea1d884f734097.tar.gz",
|
"url": "https://github.com/rose-pine/neovim/archive/72a04c4065345b51b56aed4859ea1d884f734097.tar.gz",
|
||||||
"hash": "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8"
|
"hash": "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8"
|
||||||
},
|
},
|
||||||
|
"roslyn-nvim": {
|
||||||
|
"type": "Git",
|
||||||
|
"repository": {
|
||||||
|
"type": "GitHub",
|
||||||
|
"owner": "seblyng",
|
||||||
|
"repo": "roslyn.nvim"
|
||||||
|
},
|
||||||
|
"branch": "main",
|
||||||
|
"submodules": false,
|
||||||
|
"revision": "1ebc9393d3e577d9f68102f14d98b2e4e7f15644",
|
||||||
|
"url": "https://github.com/seblyng/roslyn.nvim/archive/1ebc9393d3e577d9f68102f14d98b2e4e7f15644.tar.gz",
|
||||||
|
"hash": "0jbgxyrv59pf2n4xy821vcbwiahi4nal642nrpiwymzwya355adh"
|
||||||
|
},
|
||||||
"rtp-nvim": {
|
"rtp-nvim": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue