summaryrefslogtreecommitdiff
path: root/lua/user
diff options
context:
space:
mode:
authorRohan Ghige <rohanghige@gmail.com>2022-05-18 08:24:40 +0530
committerRohan Ghige <rohanghige@gmail.com>2022-05-18 08:24:40 +0530
commit0dbe9df71629fb06ccddb1ae7e1d27f2a4bfe02c (patch)
treed7553a689705e173a9612656c706d0ae67bababa /lua/user
parent6755f98df9b603a3323eaa76a1b7d80859868b8b (diff)
Fix warning in jsonls and whichkey
Diffstat (limited to 'lua/user')
-rw-r--r--lua/user/lsp/settings/jsonls.lua3
-rw-r--r--lua/user/whichkey.lua4
2 files changed, 5 insertions, 2 deletions
diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings/jsonls.lua
index 1fffa68..2ee88db 100644
--- a/lua/user/lsp/settings/jsonls.lua
+++ b/lua/user/lsp/settings/jsonls.lua
@@ -169,6 +169,9 @@ local schemas = {
}
local function extend(tab1, tab2)
+ if tab2 == nil then
+ return tab2
+ end
for _, value in ipairs(tab2) do
table.insert(tab1, value)
end
diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua
index 994435f..f5520b1 100644
--- a/lua/user/whichkey.lua
+++ b/lua/user/whichkey.lua
@@ -143,7 +143,7 @@ local mappings = {
i = { "<cmd>LspInfo<cr>", "Info" },
I = { "<cmd>LspInstallInfo<cr>", "Installer Info" },
j = {
- "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>",
+ "<cmd>lua vim.diagnostic.goto_next()<CR>",
"Next Diagnostic",
},
k = {
@@ -151,7 +151,7 @@ local mappings = {
"Prev Diagnostic",
},
l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
- q = { "<cmd>lua vim.lsp.diagnostic.set_loclist()<cr>", "Quickfix" },
+ q = { "<cmd>lua vim.diagnostic.setloclist()<cr>", "Quickfix" },
r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
S = {