fix: initial changes...omnisharp no longer works
This commit is contained in:
Stevan Freeborn
+274
-270
@@ -1,307 +1,311 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
"williamboman/mason.nvim",
|
"williamboman/mason.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("mason").setup()
|
require("mason").setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"williamboman/mason-lspconfig.nvim",
|
"williamboman/mason-lspconfig.nvim",
|
||||||
lazy = false,
|
lazy = false,
|
||||||
opts = {
|
opts = {
|
||||||
automatic_enable = false,
|
automatic_enable = false,
|
||||||
auto_install = true,
|
auto_install = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"linux-cultist/venv-selector.nvim",
|
"linux-cultist/venv-selector.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
"mfussenegger/nvim-dap",
|
"mfussenegger/nvim-dap",
|
||||||
"mfussenegger/nvim-dap-python",
|
"mfussenegger/nvim-dap-python",
|
||||||
{ "nvim-telescope/telescope.nvim", branch = "0.1.x", dependencies = { "nvim-lua/plenary.nvim" } },
|
{ "nvim-telescope/telescope.nvim", branch = "0.1.x", dependencies = { "nvim-lua/plenary.nvim" } },
|
||||||
},
|
},
|
||||||
ft = "python",
|
ft = "python",
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>v", "<cmd>VenvSelect<cr>" },
|
{ "<leader>v", "<cmd>VenvSelect<cr>" },
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
search = {},
|
search = {},
|
||||||
options = {},
|
options = {},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
dependencies = { "hoffs/omnisharp-extended-lsp.nvim" },
|
dependencies = { "hoffs/omnisharp-extended-lsp.nvim" },
|
||||||
lazy = false,
|
lazy = false,
|
||||||
config = function()
|
config = function()
|
||||||
local lspconfig = require("lspconfig")
|
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
|
||||||
|
|
||||||
vim.lsp.handlers["window/showMessage"] = function(_, result, ctx)
|
vim.lsp.handlers["window/showMessage"] = function(_, result, ctx)
|
||||||
local client = vim.lsp.get_client_by_id(ctx.client_id)
|
local client = vim.lsp.get_client_by_id(ctx.client_id)
|
||||||
|
|
||||||
local lvl = ({
|
local lvl = ({
|
||||||
ERROR = vim.log.levels.ERROR,
|
ERROR = vim.log.levels.ERROR,
|
||||||
WARNING = vim.log.levels.WARN,
|
WARNING = vim.log.levels.WARN,
|
||||||
INFO = vim.log.levels.INFO,
|
INFO = vim.log.levels.INFO,
|
||||||
LOG = vim.log.levels.DEBUG,
|
LOG = vim.log.levels.DEBUG,
|
||||||
})[result.type]
|
})[result.type]
|
||||||
|
|
||||||
vim.notify(result.message, lvl, {
|
vim.notify(result.message, lvl, {
|
||||||
title = string.format("LSP[%s]", client and client.name or "Unknown"),
|
title = string.format("LSP[%s]", client and client.name or "Unknown"),
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.lsp.handlers["$/progress"] = function(_, result, ctx)
|
vim.lsp.handlers["$/progress"] = function(_, result, ctx)
|
||||||
local client = vim.lsp.get_client_by_id(ctx.client_id)
|
local client = vim.lsp.get_client_by_id(ctx.client_id)
|
||||||
|
|
||||||
if result.value.kind == "begin" then
|
if result.value.kind == "begin" then
|
||||||
vim.notify(
|
vim.notify(
|
||||||
string.format("LSP[%s] %s", client and client.name or "Unknown", result.value.title),
|
string.format("LSP[%s] %s", client and client.name or "Unknown", result.value.title),
|
||||||
vim.log.levels.INFO
|
vim.log.levels.INFO
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
lspconfig.eslint.setup({
|
vim.lsp.config("eslint", {
|
||||||
on_attach = function(_, bufnr)
|
on_attach = function(_, bufnr)
|
||||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||||
buffer = bufnr,
|
buffer = bufnr,
|
||||||
command = "EslintFixAll",
|
command = "EslintFixAll",
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
on_new_config = function(config, new_root_dir)
|
on_new_config = function(config, new_root_dir)
|
||||||
config.settings.workspaceFolder = {
|
config.settings.workspaceFolder = {
|
||||||
uri = vim.uri_from_fname(new_root_dir),
|
uri = vim.uri_from_fname(new_root_dir),
|
||||||
name = vim.fn.fnamemodify(new_root_dir, ":t"),
|
name = vim.fn.fnamemodify(new_root_dir, ":t"),
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
local omnisharpCommand = vim.fn.stdpath("data") .. "/mason/bin/OmniSharp.cmd"
|
vim.lsp.enable("eslint")
|
||||||
|
|
||||||
lspconfig.omnisharp.setup({
|
local omnisharpCommand = vim.fn.stdpath("data") .. "/mason/bin/OmniSharp.cmd"
|
||||||
handlers = {
|
|
||||||
["textDocument/definition"] = require("omnisharp_extended").handler,
|
|
||||||
},
|
|
||||||
cmd = { omnisharpCommand },
|
|
||||||
capabilities = capabilities,
|
|
||||||
settings = {
|
|
||||||
FormattingOptions = {
|
|
||||||
EnableEditorConfigSupport = true,
|
|
||||||
OrganizeImports = true,
|
|
||||||
},
|
|
||||||
RoslynExtensionsOptions = {
|
|
||||||
DocumentAnalysisTimeoutMs = 30000,
|
|
||||||
EnableAnalyzersSupport = true,
|
|
||||||
EnableImportCompletion = true,
|
|
||||||
},
|
|
||||||
Sdk = {
|
|
||||||
IncludePrereleases = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
lspconfig.lua_ls.setup({
|
vim.lsp.config("omnisharp", {
|
||||||
capabilities = capabilities,
|
cmd = { omnisharpCommand },
|
||||||
})
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
|
|
||||||
local vue_language_server = vim.fn.stdpath("data")
|
vim.lsp.enable("omnisharp")
|
||||||
.. "/mason/packages/vue-language-server/node_modules/@vue/language-server"
|
|
||||||
|
|
||||||
lspconfig.ts_ls.setup({
|
vim.lsp.config("lua_ls", {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
init_options = {
|
})
|
||||||
plugins = {
|
|
||||||
{
|
|
||||||
name = "@vue/typescript-plugin",
|
|
||||||
location = vue_language_server,
|
|
||||||
languages = { "vue" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
|
|
||||||
})
|
|
||||||
|
|
||||||
lspconfig.html.setup({
|
vim.lsp.enable("lua_ls")
|
||||||
filetypes = { "html", "ejs", "vue" },
|
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
lspconfig.emmet_language_server.setup({
|
local vue_language_server = vim.fn.stdpath("data")
|
||||||
filetypes = { "html", "css", "javascriptreact", "typescriptreact", "vue" },
|
.. "/mason/packages/vue-language-server/node_modules/@vue/language-server"
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
lspconfig.cssls.setup({
|
vim.lsp.config("ts_ls", {
|
||||||
filetypes = { "css", "vue", "scss", "less" },
|
capabilities = capabilities,
|
||||||
capabilities = capabilities,
|
init_options = {
|
||||||
})
|
plugins = {
|
||||||
|
{
|
||||||
|
name = "@vue/typescript-plugin",
|
||||||
|
location = vue_language_server,
|
||||||
|
languages = { "vue" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
|
||||||
|
})
|
||||||
|
|
||||||
lspconfig.tailwindcss.setup({
|
vim.lsp.enable("ts_ls")
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
lspconfig.pyright.setup({
|
vim.lsp.config("html", {
|
||||||
capabilities = capabilities,
|
filetypes = { "html", "ejs", "vue" },
|
||||||
})
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
|
|
||||||
lspconfig.lemminx.setup({
|
vim.lsp.enable("html")
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
lspconfig.gopls.setup({
|
vim.lsp.config("emmet_language_server", {
|
||||||
capabilities = capabilities,
|
filetypes = { "html", "css", "javascriptreact", "typescriptreact", "vue" },
|
||||||
})
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("LspAttach", {
|
vim.lsp.enable("emmet_language_server")
|
||||||
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
|
||||||
callback = function(ev)
|
|
||||||
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
|
||||||
|
|
||||||
if not client then
|
vim.lsp.config("cssls", {
|
||||||
vim.notify("LSP client not found", vim.log.levels.ERROR)
|
filetypes = { "css", "vue", "scss", "less" },
|
||||||
return
|
capabilities = capabilities,
|
||||||
end
|
})
|
||||||
|
|
||||||
if not client.server_capabilities then
|
vim.lsp.enable("cssls")
|
||||||
vim.notify("LSP server not ready yet", vim.log.levels.WARN)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
client.on_error = function(err)
|
vim.lsp.config("tailwindcss", {
|
||||||
vim.notify(string.format("LSP server error: %s", err.message), vim.log.levels.ERROR)
|
capabilities = capabilities,
|
||||||
end
|
})
|
||||||
|
|
||||||
client.on_status = function(status)
|
vim.lsp.enable("tailwindcss")
|
||||||
if status == "stopped" then
|
|
||||||
vim.notify("LSP server stopped", vim.log.levels.WARN)
|
|
||||||
elseif status == "running" then
|
|
||||||
vim.notify("LSP server running", vim.log.levels.INFO)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local omnisharp = require("omnisharp_extended")
|
vim.lsp.config("pyright", {
|
||||||
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
|
|
||||||
if client.name == "omnisharp" then
|
vim.lsp.enable("pyright")
|
||||||
vim.keymap.set(
|
|
||||||
"n",
|
|
||||||
"gd",
|
|
||||||
omnisharp.telescope_lsp_definition,
|
|
||||||
{ desc = "Go to definition", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.lsp.config("lemminx", {
|
||||||
"n",
|
capabilities = capabilities,
|
||||||
"gi",
|
})
|
||||||
omnisharp.telescope_lsp_implementation,
|
|
||||||
{ desc = "Go to implementation", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.lsp.enable("lemminx")
|
||||||
"n",
|
|
||||||
"gr",
|
|
||||||
omnisharp.telescope_lsp_references,
|
|
||||||
{ desc = "Go to references", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.lsp.config("gopls", {
|
||||||
"n",
|
capabilities = capabilities,
|
||||||
"<leader>D",
|
})
|
||||||
omnisharp.telescope_lsp_type_definition,
|
|
||||||
{ desc = "Go to type definition", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
else
|
|
||||||
vim.keymap.set(
|
|
||||||
"n",
|
|
||||||
"gd",
|
|
||||||
vim.lsp.buf.definition,
|
|
||||||
{ desc = "Go to definition", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.lsp.enable("gopls")
|
||||||
"n",
|
|
||||||
"gD",
|
|
||||||
vim.lsp.buf.declaration,
|
|
||||||
{ desc = "Go to declaration", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
"n",
|
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
||||||
"gi",
|
callback = function(ev)
|
||||||
vim.lsp.buf.implementation,
|
local client = vim.lsp.get_client_by_id(ev.data.client_id)
|
||||||
{ desc = "Go to implementation", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.keymap.set(
|
if not client then
|
||||||
"n",
|
vim.notify("LSP client not found", vim.log.levels.ERROR)
|
||||||
"gr",
|
return
|
||||||
vim.lsp.buf.references,
|
end
|
||||||
{ desc = "Go to references", buffer = ev.buf }
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({ "FileType" }, {
|
if not client.server_capabilities then
|
||||||
callback = function()
|
vim.notify("LSP server not ready yet", vim.log.levels.WARN)
|
||||||
-- check if treesitter has parser
|
return
|
||||||
if require("nvim-treesitter.parsers").has_parser() then
|
end
|
||||||
-- use treesitter folding
|
|
||||||
vim.opt.foldmethod = "expr"
|
|
||||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
|
||||||
else
|
|
||||||
-- use alternative foldmethod
|
|
||||||
vim.opt.foldmethod = "syntax"
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
client.on_error = function(err)
|
||||||
pattern = "*.go",
|
vim.notify(string.format("LSP server error: %s", err.message), vim.log.levels.ERROR)
|
||||||
callback = function()
|
end
|
||||||
local params = vim.lsp.util.make_range_params()
|
|
||||||
params.context = { only = { "source.organizeImports" } }
|
|
||||||
-- buf_request_sync defaults to a 1000ms timeout. Depending on your
|
|
||||||
-- machine and codebase, you may want longer. Add an additional
|
|
||||||
-- argument after params if you find that you have to write the file
|
|
||||||
-- twice for changes to be saved.
|
|
||||||
-- E.g., vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 3000)
|
|
||||||
local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params)
|
|
||||||
for cid, res in pairs(result or {}) do
|
|
||||||
for _, r in pairs(res.result or {}) do
|
|
||||||
if r.edit then
|
|
||||||
local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16"
|
|
||||||
vim.lsp.util.apply_workspace_edit(r.edit, enc)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
vim.lsp.buf.format({ async = false })
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.keymap.set(
|
client.on_status = function(status)
|
||||||
"n",
|
if status == "stopped" then
|
||||||
"<leader>ca",
|
vim.notify("LSP server stopped", vim.log.levels.WARN)
|
||||||
vim.lsp.buf.code_action,
|
elseif status == "running" then
|
||||||
{ desc = "Code actions", buffer = ev.buf }
|
vim.notify("LSP server running", vim.log.levels.INFO)
|
||||||
)
|
end
|
||||||
|
end
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "Rename", buffer = ev.buf })
|
local omnisharp = require("omnisharp_extended")
|
||||||
vim.keymap.set(
|
|
||||||
"n",
|
if client.name == "omnisharp" then
|
||||||
"<leader>e",
|
vim.keymap.set(
|
||||||
vim.diagnostic.open_float,
|
"n",
|
||||||
{ desc = "Display error for current line", buffer = ev.buf }
|
"gd",
|
||||||
)
|
omnisharp.telescope_lsp_definition,
|
||||||
vim.keymap.set(
|
{ desc = "Go to definition", buffer = ev.buf }
|
||||||
"n",
|
)
|
||||||
"<leader>ea",
|
|
||||||
":Telescope diagnostics bufnr=0<CR>",
|
vim.keymap.set(
|
||||||
{ desc = "Display errors for current buffer", buffer = ev.buf }
|
"n",
|
||||||
)
|
"gi",
|
||||||
vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Display symbol info", buffer = ev.buf })
|
omnisharp.telescope_lsp_implementation,
|
||||||
end,
|
{ desc = "Go to implementation", buffer = ev.buf }
|
||||||
})
|
)
|
||||||
end,
|
|
||||||
},
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gr",
|
||||||
|
omnisharp.telescope_lsp_references,
|
||||||
|
{ desc = "Go to references", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"<leader>D",
|
||||||
|
omnisharp.telescope_lsp_type_definition,
|
||||||
|
{ desc = "Go to type definition", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
else
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gd",
|
||||||
|
vim.lsp.buf.definition,
|
||||||
|
{ desc = "Go to definition", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gD",
|
||||||
|
vim.lsp.buf.declaration,
|
||||||
|
{ desc = "Go to declaration", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gi",
|
||||||
|
vim.lsp.buf.implementation,
|
||||||
|
{ desc = "Go to implementation", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"gr",
|
||||||
|
vim.lsp.buf.references,
|
||||||
|
{ desc = "Go to references", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd({ "FileType" }, {
|
||||||
|
callback = function()
|
||||||
|
-- check if treesitter has parser
|
||||||
|
if require("nvim-treesitter.parsers").has_parser() then
|
||||||
|
-- use treesitter folding
|
||||||
|
vim.opt.foldmethod = "expr"
|
||||||
|
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||||
|
else
|
||||||
|
-- use alternative foldmethod
|
||||||
|
vim.opt.foldmethod = "syntax"
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||||
|
pattern = "*.go",
|
||||||
|
callback = function()
|
||||||
|
local params = vim.lsp.util.make_range_params()
|
||||||
|
params.context = { only = { "source.organizeImports" } }
|
||||||
|
-- buf_request_sync defaults to a 1000ms timeout. Depending on your
|
||||||
|
-- machine and codebase, you may want longer. Add an additional
|
||||||
|
-- argument after params if you find that you have to write the file
|
||||||
|
-- twice for changes to be saved.
|
||||||
|
-- E.g., vim.lsp.buf_request_sync(0, "textDocument/codeAction", params, 3000)
|
||||||
|
local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params)
|
||||||
|
for cid, res in pairs(result or {}) do
|
||||||
|
for _, r in pairs(res.result or {}) do
|
||||||
|
if r.edit then
|
||||||
|
local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16"
|
||||||
|
vim.lsp.util.apply_workspace_edit(r.edit, enc)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
vim.lsp.buf.format({ async = false })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"<leader>ca",
|
||||||
|
vim.lsp.buf.code_action,
|
||||||
|
{ desc = "Code actions", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { desc = "Rename", buffer = ev.buf })
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"<leader>e",
|
||||||
|
vim.diagnostic.open_float,
|
||||||
|
{ desc = "Display error for current line", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"<leader>ea",
|
||||||
|
":Telescope diagnostics bufnr=0<CR>",
|
||||||
|
{ desc = "Display errors for current buffer", buffer = ev.buf }
|
||||||
|
)
|
||||||
|
vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Display symbol info", buffer = ev.buf })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user