From 19f0c8ccfafa0f2e634610c0aeb174b0983a52c1 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sat, 15 Jan 2022 12:32:06 +0100
Subject: fix(diag): show lsp-diag code in open_float (#2180)

---
 lua/lvim/lsp/config.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lua/lvim/lsp/config.lua')

diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 64cf52f0..817ccd9f 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -23,8 +23,9 @@ return {
       prefix = "",
       format = function(d)
         local t = vim.deepcopy(d)
-        if d.code then
-          t.message = string.format("%s [%s]", t.message, t.code):gsub("1. ", "")
+        local code = d.code or d.user_data.lsp.code
+        if code then
+          t.message = string.format("%s [%s]", t.message, code):gsub("1. ", "")
         end
         return t.message
       end,
-- 
cgit v1.2.3


From 626343c2de0599d1129e1e6b70d62aacc56ab000 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sun, 16 Jan 2022 20:32:39 +0100
Subject: fix(lsp): use temporary fork of lua-dev (#2187)

---
 lua/lvim/lsp/config.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lua/lvim/lsp/config.lua')

diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 817ccd9f..b45142f5 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -78,6 +78,7 @@ return {
     "jedi_language_server",
     "ltex",
     "phpactor",
+    "psalm",
     "pylsp",
     "quick_lint_js",
     "remark_ls",
-- 
cgit v1.2.3