diff options
| author | Ariel D'Alessandro <dalessandro.ariel@gmail.com> | 2023-09-05 15:35:27 +0200 |
|---|---|---|
| committer | Ariel D'Alessandro <dalessandro.ariel@gmail.com> | 2023-09-05 15:35:27 +0200 |
| commit | 75c19f44876bc6833ecd5ccb0d715cab8d70416b (patch) | |
| tree | cb6fcec87d183fb704c9531f74d9ba9e936eea3a /lua/alpha | |
| parent | c46d110c48172b0e9ae0ac9cb9c38a5124d0236c (diff) | |
| download | nvim-conf-75c19f44876bc6833ecd5ccb0d715cab8d70416b.tar.gz nvim-conf-75c19f44876bc6833ecd5ccb0d715cab8d70416b.zip | |
updates
Diffstat (limited to 'lua/alpha')
| -rw-r--r-- | lua/alpha/lsp/attach.lua | 2 | ||||
| -rw-r--r-- | lua/alpha/lsp/mason.lua | 12 | ||||
| -rw-r--r-- | lua/alpha/lsp/servers.lua | 8 | ||||
| -rw-r--r-- | lua/alpha/test_strategy.lua | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/lua/alpha/lsp/attach.lua b/lua/alpha/lsp/attach.lua index 84212a6..e15ad92 100644 --- a/lua/alpha/lsp/attach.lua +++ b/lua/alpha/lsp/attach.lua @@ -1,7 +1,7 @@ local telescope_mapper = require "alpha.telescope.mappings" local filetype_attach = setmetatable({ - php = function(client, bufnr) + php = function(_, bufnr) vim.api.nvim_buf_create_user_command(bufnr, "LspPhpactorReindex", function() vim.lsp.buf_notify(bufnr, "phpactor/index/reindex", {}) end, {}) diff --git a/lua/alpha/lsp/mason.lua b/lua/alpha/lsp/mason.lua index 752f6ac..a8c6ce7 100644 --- a/lua/alpha/lsp/mason.lua +++ b/lua/alpha/lsp/mason.lua @@ -12,12 +12,12 @@ for server, _ in pairs(servers) do end mason_lspconfig.setup { - ensure_installed = mason_servers, + -- ensure_installed = mason_servers, } -- filter the list for the ones not globally installed -require("mason-tool-installer").setup { - ensure_installed = vim.tbl_filter(function (tool) - return vim.fn.executable(tool) == 0 - end, require "alpha.lsp.tools"), -} +-- require("mason-tool-installer").setup { +-- ensure_installed = vim.tbl_filter(function (tool) +-- return vim.fn.executable(tool) == 0 +-- end, require "alpha.lsp.tools"), +-- } diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua index ab70468..14ec9d3 100644 --- a/lua/alpha/lsp/servers.lua +++ b/lua/alpha/lsp/servers.lua @@ -76,7 +76,13 @@ return { }, } end, - ["marksman"] = default, + ["omnisharp"] = function() + return { + cmd = {"OmniSharp"}, + on_attach = lsp_attach, + flags = lsp_flags, + } + end, ["nil_ls"] = default, ["phpactor"] = function() return { diff --git a/lua/alpha/test_strategy.lua b/lua/alpha/test_strategy.lua index 46aae3c..9a2d34a 100644 --- a/lua/alpha/test_strategy.lua +++ b/lua/alpha/test_strategy.lua @@ -51,7 +51,7 @@ local function myStrategy(cmd) vim.notify("Test run successfully", vim.log.levels.INFO, { title = "Test" }) return end - local result = j:stderr_result() + local result = j:stderr_result() or j:stdout_result() -- join result in a single string result = table.concat(result, "\n") -- escape / characters |