neovim: fix omnisharp jump to definition for assembly/decompilation l…

…oading
contrun · Dec 8, 2023 · b394c43 · b394c43
1 parent 92c4037
commit b394c43
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/dot_config/nvim/lua/plugins.lua b/dot_config/nvim/lua/plugins.lua
@@ -134,6 +134,7 @@ return require('packer').startup({
         use {"williamboman/mason.nvim"}
         use {"williamboman/mason-lspconfig.nvim"}
 
+        use {"Hoffs/omnisharp-extended-lsp.nvim"}
         use {
             'ionide/Ionide-vim',
             config = function()

diff --git a/dot_config/nvim/lua/plugins/lspconfig.lua b/dot_config/nvim/lua/plugins/lspconfig.lua
@@ -50,12 +50,23 @@ local setup_servers = function()
                 return options
             end,
             ["omnisharp"] = function(options)
-                local pid = vim.fn.getpid()
-                local omnisharp_bin = "omnisharp"
-                options.cmd = {
-                    omnisharp_bin, "--languageserver", "--hostPID",
-                    tostring(pid)
+                options.handlers = {
+                    ["textDocument/definition"] = require('omnisharp_extended').handler
                 }
+                local omnisharp_bin
+                for _, bin in ipairs({"omnisharp", "OmniSharp"}) do
+                    if vim.fn.executable(bin) == 1 then
+                        omnisharp_bin = bin
+                        break
+                    end
+                end
+                if omnisharp_bin then
+                    local pid = vim.fn.getpid()
+                    options.cmd = {
+                        omnisharp_bin, "--languageserver", "--hostPID",
+                        tostring(pid)
+                    }
+                end
                 return options
             end
         }