From 9ddc25c39d6f30a78b46e50954380fee19541419 Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Sun, 5 Nov 2023 16:59:31 -0600 Subject: [PATCH] csharp and neotree diags --- vim/.vim/lua/plugins/lsp_lines.lua | 9 ++---- vim/.vim/lua/plugins/mason.lua | 48 ++++++++++++++++++++++++++++-- vim/.vim/lua/plugins/neotree.lua | 15 +++++----- vim/.vim/lua/plugins/trouble.lua | 2 +- 4 files changed, 58 insertions(+), 16 deletions(-) diff --git a/vim/.vim/lua/plugins/lsp_lines.lua b/vim/.vim/lua/plugins/lsp_lines.lua index cbc145e..00fc984 100644 --- a/vim/.vim/lua/plugins/lsp_lines.lua +++ b/vim/.vim/lua/plugins/lsp_lines.lua @@ -1,18 +1,15 @@ return { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim", name = "lsp_lines.nvim", - lazy = false, config = function() vim.diagnostic.config({ - virtual_lines = { only_current_line = true }, - -- virtual_lines = true, - - update_in_insert = false, + -- virtual_lines = { only_current_line = true }, + virtual_lines = true, + update_on_insert = false, virtual_text = false, }) require("lsp_lines").setup() - -- require("lsp_lines").toggle() end, keys = { { diff --git a/vim/.vim/lua/plugins/mason.lua b/vim/.vim/lua/plugins/mason.lua index 9bf3d87..654fc6a 100644 --- a/vim/.vim/lua/plugins/mason.lua +++ b/vim/.vim/lua/plugins/mason.lua @@ -54,6 +54,46 @@ return { ["rust_analyzer"] = function() require("rust-tools").setup({}) end, + ["omnisharp_mono"] = function() + require("lspconfig").omnisharp_mono.setup({ + -- cmd = { "dotnet", "/path/to/omnisharp/OmniSharp.dll" }, + + -- Enables support for reading code style, naming convention and analyzer + -- settings from .editorconfig. + enable_editorconfig_support = true, + + -- If true, MSBuild project system will only load projects for files that + -- were opened in the editor. This setting is useful for big C# codebases + -- and allows for faster initialization of code navigation features only + -- for projects that are relevant to code that is being edited. With this + -- setting enabled OmniSharp may load fewer projects and may thus display + -- incomplete reference lists for symbols. + enable_ms_build_load_projects_on_demand = false, -- default false + + -- Enables support for roslyn analyzers, code fixes and rulesets. + enable_roslyn_analyzers = true, -- default false + + -- Specifies whether 'using' directives should be grouped and sorted during + -- document formatting. + organize_imports_on_format = true, -- default false + + -- Enables support for showing unimported types and unimported extension + -- methods in completion lists. When committed, the appropriate using + -- directive will be added at the top of the current file. This option can + -- have a negative impact on initial completion responsiveness, + -- particularly for the first few completion sessions after opening a + -- solution. + enable_import_completion = true, -- default false + + -- Specifies whether to include preview versions of the .NET SDK when + -- determining which version to use for project loading. + sdk_include_prereleases = true, + + -- Only run analyzers against open files when 'enableRoslynAnalyzers' is + -- true + analyze_open_documents_only = true, -- default false + }) + end, ["lua_ls"] = function() require("lspconfig").lua_ls.setup({ settings = { @@ -71,9 +111,13 @@ return { }, }, workspace = { - checkThirdParty = false, --# stop a anoying dialog on startup + checkThirdParty = false, -- stop a annoying dialog on startup -- Make the server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), + -- library = vim.api.nvim_get_runtime_file("", true), + library = { + [vim.fn.expand("$VIMRUNTIME/lua")] = true, + [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true, + }, }, -- Do not send telemetry data containing a randomized but unique identifier telemetry = { diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua index 1ec81e7..9c85c4f 100644 --- a/vim/.vim/lua/plugins/neotree.lua +++ b/vim/.vim/lua/plugins/neotree.lua @@ -4,6 +4,13 @@ return { branch = "v2.x", config = function() require("neo-tree").setup({ + sources = { + "filesystem", + "buffers", + "git_status", + "diagnostics", + -- ...and any additional source + }, hijack_netrw_behavior = "open_current", window = { mappings = { @@ -14,17 +21,11 @@ return { end, dependencies = { "nvim-lua/plenary.nvim", + "mrbjarksen/neo-tree-diagnostics.nvim", "MunifTanjim/nui.nvim", }, - lazy = false, keys = { { "", ":Neotree filesystem reveal toggle reveal_force_cwd", desc = "Open NeoTree" }, - }, - }, - { - "mrbjarksen/neo-tree-diagnostics.nvim", - dependencies = { "nvim-neo-tree/neo-tree.nvim" }, - keys = { { "xd", "Neotree diagnostics reveal bottom" }, }, }, diff --git a/vim/.vim/lua/plugins/trouble.lua b/vim/.vim/lua/plugins/trouble.lua index ebcecf5..07be375 100644 --- a/vim/.vim/lua/plugins/trouble.lua +++ b/vim/.vim/lua/plugins/trouble.lua @@ -10,7 +10,7 @@ return { warning = " ", hint = " ", information = " ", - other = "?﫠", + other = " ", }, use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client })