From f36082da0dccf4cfc50dd3fec271b7a5cd41aaea Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sat, 31 Jul 2021 14:52:25 +0200 Subject: feat: add diagnostics source name (#1147) --- lua/lsp/handlers.lua | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'lua/lsp/handlers.lua') diff --git a/lua/lsp/handlers.lua b/lua/lsp/handlers.lua index d3a487ae..3a467d42 100644 --- a/lua/lsp/handlers.lua +++ b/lua/lsp/handlers.lua @@ -9,6 +9,40 @@ function M.setup() underline = lvim.lsp.document_highlight, }) + vim.lsp.handlers["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _) + local config = { -- your config + virtual_text = lvim.lsp.diagnostics.virtual_text, + signs = lvim.lsp.diagnostics.signs, + underline = lvim.lsp.diagnostics.underline, + update_in_insert = lvim.lsp.diagnostics.update_in_insert, + severity_sort = lvim.lsp.diagnostics.severity_sort, + } + local uri = params.uri + local bufnr = vim.uri_to_bufnr(uri) + + if not bufnr then + return + end + + local diagnostics = params.diagnostics + + for i, v in ipairs(diagnostics) do + diagnostics[i].message = string.format("%s: %s", v.source, v.message) + + if vim.tbl_contains(vim.tbl_keys(v), "code") then + diagnostics[i].message = diagnostics[i].message .. string.format(" [%s]", v.code) + end + end + + vim.lsp.diagnostic.save(diagnostics, bufnr, client_id) + + if not vim.api.nvim_buf_is_loaded(bufnr) then + return + end + + vim.lsp.diagnostic.display(diagnostics, bufnr, client_id, config) + end + vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = lvim.lsp.popup_border, }) -- cgit v1.2.3 From fe5daa722fb75ad85c24936cbb645018bb9d655b Mon Sep 17 00:00:00 2001 From: Luc Sinet Date: Sat, 31 Jul 2021 16:12:29 +0200 Subject: [Feature] Expose lsp config (#1156) --- lua/lsp/handlers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lsp/handlers.lua') diff --git a/lua/lsp/handlers.lua b/lua/lsp/handlers.lua index 3a467d42..a25db3c1 100644 --- a/lua/lsp/handlers.lua +++ b/lua/lsp/handlers.lua @@ -5,7 +5,7 @@ local M = {} function M.setup() vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, { virtual_text = lvim.lsp.diagnostics.virtual_text, - signs = lvim.lsp.diagnostics.signs, + signs = lvim.lsp.diagnostics.signs.active, underline = lvim.lsp.document_highlight, }) -- cgit v1.2.3 From 30ad4b81f5dbccb6d49eb28ffdd33cefcb758ee5 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Sun, 1 Aug 2021 14:27:15 +0430 Subject: Hotfix/eslint d (#1198) --- lua/lsp/handlers.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lua/lsp/handlers.lua') diff --git a/lua/lsp/handlers.lua b/lua/lsp/handlers.lua index a25db3c1..849d2a03 100644 --- a/lua/lsp/handlers.lua +++ b/lua/lsp/handlers.lua @@ -27,7 +27,11 @@ function M.setup() local diagnostics = params.diagnostics for i, v in ipairs(diagnostics) do - diagnostics[i].message = string.format("%s: %s", v.source, v.message) + local source = v.source + if string.find(v.source, "/") then + source = string.sub(v.source, string.find(v.source, "([%w-_]+)$")) + end + diagnostics[i].message = string.format("%s: %s", source, v.message) if vim.tbl_contains(vim.tbl_keys(v), "code") then diagnostics[i].message = diagnostics[i].message .. string.format(" [%s]", v.code) -- cgit v1.2.3 From fc018cdc4735e3ba3e456a153ab672c8eb4df043 Mon Sep 17 00:00:00 2001 From: Will Leinweber Date: Mon, 2 Aug 2021 21:51:32 -0700 Subject: Fix lsp reporting when v.source is nil (#1209) --- lua/lsp/handlers.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lua/lsp/handlers.lua') diff --git a/lua/lsp/handlers.lua b/lua/lsp/handlers.lua index 849d2a03..2322e76a 100644 --- a/lua/lsp/handlers.lua +++ b/lua/lsp/handlers.lua @@ -28,10 +28,14 @@ function M.setup() for i, v in ipairs(diagnostics) do local source = v.source - if string.find(v.source, "/") then - source = string.sub(v.source, string.find(v.source, "([%w-_]+)$")) + if source then + if string.find(source, "/") then + source = string.sub(v.source, string.find(v.source, "([%w-_]+)$")) + end + diagnostics[i].message = string.format("%s: %s", source, v.message) + else + diagnostics[i].message = string.format("%s", v.message) end - diagnostics[i].message = string.format("%s: %s", source, v.message) if vim.tbl_contains(vim.tbl_keys(v), "code") then diagnostics[i].message = diagnostics[i].message .. string.format(" [%s]", v.code) -- cgit v1.2.3