Skip to content

Commit edb018e

Browse files
authored
Merge pull request #14 from oriori1703/chore/raise-nvim-version-maintained-upstream
Raise the minimum nvim version to 0.11
2 parents 06a3217 + 50a36d3 commit edb018e

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

init.lua

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -591,26 +591,13 @@ require('lazy').setup({
591591
-- Toggle to show/hide diagnostic messages
592592
map('<leader>td', function() vim.diagnostic.enable(not vim.diagnostic.is_enabled()) end, '[T]oggle [D]iagnostics')
593593

594-
-- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
595-
---@param client vim.lsp.Client
596-
---@param method vim.lsp.protocol.Method
597-
---@param bufnr? integer some lsp support methods only in specific files
598-
---@return boolean
599-
local function client_supports_method(client, method, bufnr)
600-
if vim.fn.has 'nvim-0.11' == 1 then
601-
return client:supports_method(method, bufnr)
602-
else
603-
return client.supports_method(method, { bufnr = bufnr })
604-
end
605-
end
606-
607594
-- The following two autocommands are used to highlight references of the
608595
-- word under your cursor when your cursor rests there for a little while.
609596
-- See `:help CursorHold` for information about when this is executed
610597
--
611598
-- When you move your cursor, the highlights will be cleared (the second autocommand).
612599
local client = vim.lsp.get_client_by_id(event.data.client_id)
613-
if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
600+
if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
614601
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
615602
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
616603
buffer = event.buf,
@@ -637,7 +624,7 @@ require('lazy').setup({
637624
-- code, if the language server you are using supports them
638625
--
639626
-- This may be unwanted, since they displace some of your code
640-
if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
627+
if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
641628
map('<leader>th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints')
642629
end
643630
end,

lua/kickstart/health.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local check_version = function()
1212
return
1313
end
1414

15-
if vim.version.ge(vim.version(), '0.10-dev') then
15+
if vim.version.ge(vim.version(), '0.11') then
1616
vim.health.ok(string.format("Neovim version is: '%s'", verstr))
1717
else
1818
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))

0 commit comments

Comments
 (0)