From 8f25c56bf68708840fda59762a2cdfbb2b6b0fb2 Mon Sep 17 00:00:00 2001 From: Gary Murray Date: Thu, 16 Nov 2023 10:33:33 -0700 Subject: [PATCH] Remove the need to check vim version --- lua/lazyvim/plugins/lsp/init.lua | 8 ++------ lua/lazyvim/util/lsp.lua | 9 +++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index c20f093c..f454ac1c 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -115,16 +115,12 @@ return { vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" }) end - local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint + local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint.enable if opts.inlay_hints.enabled and inlay_hint then Util.lsp.on_attach(function(client, buffer) if client.supports_method("textDocument/inlayHint") then - if vim.fn.has("nvim-0.10") == 1 then - inlay_hint.enable(buffer, true) - else - inlay_hint(buffer, true) - end + inlay_hint(buffer, true) end end) end diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua index 4d0941f7..9eb9423e 100644 --- a/lua/lazyvim/util/lsp.lua +++ b/lua/lazyvim/util/lsp.lua @@ -125,12 +125,9 @@ end ---@param bufnr? number function M.toggle_inline_hint(bufnr) bufnr = bufnr or 0 - if vim.fn.has("nvim-0.10") then - if vim.lsp.inlay_hint.is_enabled() then - vim.lsp.inlay_hint.enable(bufnr, false) - else - vim.lsp.inlay_hint.enable(bufnr, true) - end + local inlay_hint = vim.lsp.buf.inlay_hint or vim.lsp.inlay_hint + if inlay_hint.enable then + vim.lsp.inlay_hint.enable(bufnr, not inlay_hint.is_enabled()) else vim.lsp.inlay_hint(bufnr, nil) end