From 089606b48dc6bb94bac36d1c30e50899a8d6f81f Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Fri, 30 Jun 2023 20:44:39 +0200 Subject: [PATCH] fix(lsp): upstream inlay_hint rename --- lua/lazyvim/config/keymaps.lua | 4 ++-- lua/lazyvim/plugins/lsp/init.lua | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua index 93bc5b0c..eb037bd9 100644 --- a/lua/lazyvim/config/keymaps.lua +++ b/lua/lazyvim/config/keymaps.lua @@ -112,8 +112,8 @@ map("n", "ul", function() Util.toggle("relativenumber", true) Util.toggl map("n", "ud", Util.toggle_diagnostics, { desc = "Toggle Diagnostics" }) local conceallevel = vim.o.conceallevel > 0 and vim.o.conceallevel or 3 map("n", "uc", function() Util.toggle("conceallevel", false, {0, conceallevel}) end, { desc = "Toggle Conceal" }) -if vim.lsp.buf.inlay_hint then - map("n", "uh", function() vim.lsp.buf.inlay_hint(0, nil) end, { desc = "Toggle Inlay Hints" }) +if vim.lsp.inlay_hint then + map("n", "uh", function() vim.lsp.inlay_hint(0, nil) end, { desc = "Toggle Inlay Hints" }) end -- lazygit diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index 260abcae..b3f9d00c 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -98,10 +98,12 @@ return { vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" }) end - if opts.inlay_hints.enabled and vim.lsp.buf.inlay_hint then + local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint + + if opts.inlay_hints.enabled and inlay_hint then Util.on_attach(function(client, buffer) if client.server_capabilities.inlayHintProvider then - vim.lsp.buf.inlay_hint(buffer, true) + inlay_hint(buffer, true) end end) end