From b0603bfe79ef5852ce38b07fc456513dba54f623 Mon Sep 17 00:00:00 2001
From: Ivar Fatland <ivar.fatland@bouvet.no>
Date: Thu, 5 Jun 2025 09:51:49 +0200
Subject: [PATCH] update roslyn config

---
 init.lua | 53 +++++++++++++++++------------------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/init.lua b/init.lua
index f3d6d5b..590be54 100644
--- a/init.lua
+++ b/init.lua
@@ -335,33 +335,27 @@ require'lazy'.setup{ --{{{1
     },
     { 'seblyng/roslyn.nvim', --{{{2
         --WARN: requires html-lsp, roslyn and rzls installed via Mason
-        dependencies = { 'tris203/rzls.nvim', },
+        dependencies = {
+            'tris203/rzls.nvim',
+            config = true,
+        },
         ft = {'cs', 'razor'},
         config = function()
+            local mason_registry = require("mason-registry")
+            local rzls_path = vim.fn.expand("$MASON/packages/rzls/libexec")
+            local cmd = {
+                "roslyn",
+                "--stdio",
+                "--logLevel=Information",
+                "--extensionLogDirectory=" .. vim.fs.dirname(vim.lsp.get_log_path()),
+                "--razorSourceGenerator=" .. vim.fs.joinpath(rzls_path, "Microsoft.CodeAnalysis.Razor.Compiler.dll"),
+                "--razorDesignTimePath=" .. vim.fs.joinpath(rzls_path, "Targets", "Microsoft.NET.Sdk.Razor.DesignTime.targets"),
+                "--extension",
+                vim.fs.joinpath(rzls_path, "RazorExtension", "Microsoft.VisualStudioCode.RazorExtension.dll"),
+            }
             require'rzls'.setup{}
             require'roslyn'.setup{
-                args = {
-                    '--stdio',
-                    '--logLevel=Information',
-                    '--extensionLogDirectory=' .. vim.fs.dirname(vim.lsp.get_log_path()),
-                    '--razorSourceGenerator=' .. vim.fs.joinpath(
-                        vim.fn.stdpath'data' --[[@as string]],
-                        'mason',
-                        'packages',
-                        'roslyn',
-                        'libexec',
-                        'Microsoft.CodeAnalysis.Razor.Compiler.dll'
-                    ),
-                    '--razorDesignTimePath=' .. vim.fs.joinpath(
-                        vim.fn.stdpath'data' --[[@as string]],
-                        'mason',
-                        'packages',
-                        'rzls',
-                        'libexec',
-                        'Targets',
-                        'Microsoft.NET.Sdk.Razor.DesignTime.targets'
-                    ),
-                },
+                cmd = cmd,
                 config = {
                     handlers = require 'rzls.roslyn_handlers',
                     ['csharp|code_lens'] = {
@@ -378,19 +372,6 @@ require'lazy'.setup{ --{{{1
                 }
             }
         end,
-        opts = {
-            exe = {
-                'dotnet',
-                vim.fs.joinpath(
-                    vim.fn.stdpath'data' --[[@as string]],
-                    'mason',
-                    'packages',
-                    'roslyn',
-                    'libexec',
-                    'Microsoft.CodeAnalysis.LanguageServer.dll'
-                )
-            },
-        },
     },
     { "folke/lazydev.nvim", --{{{2
         ft = "lua", -- only load on lua files