Skip to content

Commit 8d667bb

Browse files
VlaDexammirusmrr11kqgates
authored andcommitted
Neovim 0.10 updates (nvim-lua#936)
* Neovim 0.10 updates Provide the buffer for which to enable inlay hints Co-authored-by: Matt Mirus <matt@mattmirus.com> * refactor: replace vim.loop with vim.uv * Upgrade folke/neodev (sunsetting) to folke/lazydev * Update checkhealth for 0.10 release --------- Co-authored-by: Matt Mirus <matt@mattmirus.com> Co-authored-by: mrr11k <me+github@mrr11k.dev> Co-authored-by: Seb Tomasini <sebt@qgates.com>
1 parent f08868b commit 8d667bb

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

init.lua

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ vim.opt.hlsearch = true
164164
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
165165

166166
-- Diagnostic keymaps
167-
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' })
168-
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' })
169-
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
170167
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
171168

172169
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
@@ -222,7 +219,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
222219
-- [[ Install `lazy.nvim` plugin manager ]]
223220
-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
224221
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
225-
if not vim.loop.fs_stat(lazypath) then
222+
if not vim.uv.fs_stat(lazypath) then
226223
local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
227224
local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
228225
if vim.v.shell_error ~= 0 then
@@ -252,11 +249,6 @@ require('lazy').setup({
252249
--
253250
-- Use `opts = {}` to force a plugin to be loaded.
254251
--
255-
-- This is equivalent to:
256-
-- require('Comment').setup({})
257-
258-
-- "gc" to comment visual regions/lines
259-
{ 'numToStr/Comment.nvim', opts = {} },
260252

261253
-- Here is a more advanced example where we pass configuration
262254
-- options to `gitsigns.nvim`. This is equivalent to the following Lua:
@@ -438,9 +430,9 @@ require('lazy').setup({
438430
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
439431
{ 'j-hui/fidget.nvim', opts = {} },
440432

441-
-- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
433+
-- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
442434
-- used for completion, annotations and signatures of Neovim apis
443-
{ 'folke/neodev.nvim', opts = {} },
435+
{ 'folke/lazydev.nvim', ft = 'lua', opts = {} },
444436
},
445437
config = function()
446438
-- Brief aside: **What is LSP?**
@@ -517,10 +509,6 @@ require('lazy').setup({
517509
-- or a suggestion from your LSP for this to activate.
518510
map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
519511

520-
-- Opens a popup that displays documentation about the word under your cursor
521-
-- See `:help K` for why this keymap.
522-
map('K', vim.lsp.buf.hover, 'Hover Documentation')
523-
524512
-- WARN: This is not Goto Definition, this is Goto Declaration.
525513
-- For example, in C this would take you to the header.
526514
map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
@@ -531,7 +519,7 @@ require('lazy').setup({
531519
--
532520
-- When you move your cursor, the highlights will be cleared (the second autocommand).
533521
local client = vim.lsp.get_client_by_id(event.data.client_id)
534-
if client and client.server_capabilities.documentHighlightProvider then
522+
if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
535523
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
536524
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
537525
buffer = event.buf,
@@ -558,9 +546,9 @@ require('lazy').setup({
558546
-- code, if the language server you are using supports them
559547
--
560548
-- This may be unwanted, since they displace some of your code
561-
if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then
549+
if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
562550
map('<leader>th', function()
563-
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
551+
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
564552
end, '[T]oggle Inlay [H]ints')
565553
end
566554
end,
@@ -786,6 +774,11 @@ require('lazy').setup({
786774
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
787775
},
788776
sources = {
777+
{
778+
name = 'lazydev',
779+
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
780+
group_index = 0,
781+
},
789782
{ name = 'nvim_lsp' },
790783
{ name = 'luasnip' },
791784
{ name = 'path' },

lua/kickstart/health.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
--]]
77

88
local check_version = function()
9-
local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch)
10-
if not vim.version.cmp then
9+
local verstr = tostring(vim.version())
10+
if not vim.version.ge then
1111
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
1212
return
1313
end
1414

15-
if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
15+
if vim.version.ge(vim.version(), '0.10-dev') 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)