fix: replace deprecated table operations for neovim v0.10 #489

mikesmithgh · 2024-04-24T12:11:16Z

Resolves #488.

Neovim nightly deprecated some table operations resulting in diffview.nvim crashes. I've moved the operations islist and flatten to the utils package so that we can apply the appropriate function depending on the Neovim version.

Please let me know what you think, thanks!

FunctionalHacker · 2024-04-25T12:19:23Z

Just tested this on my machine, works well!

serranomorante · 2024-04-29T19:39:45Z

Can you try with the command DiffviewFileHistory %? I believe it doesn't work after this change.

mikesmithgh · 2024-04-30T02:18:03Z

@serranomorante I tried DiffviewFileHistory % and it looks like it working for me. Are you seeing an error?

ctretyak · 2024-04-30T05:41:36Z

I am using Neogit, that uses diffview.nvim. I have the same problem on markdowns (.md) files only. Other diffs are OK (.json, etc)

LinoWhy · 2024-04-30T06:19:47Z

@serranomorante I tried DiffviewFileHistory % and it looks like it working for me. Are you seeing an error?

@mikesmithgh I meet the same issue, with the following error:

   Error  14:17:56 msg_show.lua_error   DiffviewFileHistory % Error executing luv callback:
...al/share/nvim/lazy/diffview.nvim/lua/diffview/logger.lua:382: attempt to call method 'gsub' (a nil value)
stack traceback:
	...al/share/nvim/lazy/diffview.nvim/lua/diffview/logger.lua:382: in function <...al/share/nvim/lazy/diffview.nvim/lua/diffview/logger.lua:380>
	vim/shared.lua: in function 'tbl_map'
	...al/share/nvim/lazy/diffview.nvim/lua/diffview/logger.lua:380: in function 'log_job'
	...local/share/nvim/lazy/diffview.nvim/lua/diffview/job.lua:345: in function <...local/share/nvim/lazy/diffview.nvim/lua/diffview/job.lua:308>
	[C]: in function 'wait'
	...local/share/nvim/lazy/diffview.nvim/lua/diffview/job.lua:408: in function 'sync'
	...cal/share/nvim/lazy/diffview.nvim/lua/diffview/utils.lua:349: in function 'exec_sync'
	...azy/diffview.nvim/lua/diffview/vcs/adapters/git/init.lua:687: in function 'is_single_file'
	...azy/diffview.nvim/lua/diffview/vcs/adapters/git/init.lua:696: in function 'file_history_dry_run'
	...azy/diffview.nvim/lua/diffview/vcs/adapters/git/init.lua:820: in function 'file_history_options'
	...local/share/nvim/lazy/diffview.nvim/lua/diffview/lib.lua:93: in function 'file_history'
	...ocal/share/nvim/lazy/diffview.nvim/lua/diffview/init.lua:139: in function 'file_history'
	....local/share/nvim/lazy/diffview.nvim/plugin/diffview.lua:34: in function <....local/share/nvim/lazy/diffview.nvim/plugin/diffview.lua:27>
   Error  14:18:28 msg_show.lua_error Error executing Lua callback: ...local/share/nvim/lazy/diffview.nvim/lua/diffview/job.lua:416: Synchronous job timed out!
stack traceback:
	[C]: in function 'error'
	...local/share/nvim/lazy/diffview.nvim/lua/diffview/job.lua:416: in function 'sync'
	...cal/share/nvim/lazy/diffview.nvim/lua/diffview/utils.lua:349: in function 'exec_sync'
	...azy/diffview.nvim/lua/diffview/vcs/adapters/git/init.lua:687: in function 'is_single_file'
	...azy/diffview.nvim/lua/diffview/vcs/adapters/git/init.lua:696: in function 'file_history_dry_run'
	...azy/diffview.nvim/lua/diffview/vcs/adapters/git/init.lua:820: in function 'file_history_options'
	...local/share/nvim/lazy/diffview.nvim/lua/diffview/lib.lua:93: in function 'file_history'
	...ocal/share/nvim/lazy/diffview.nvim/lua/diffview/init.lua:139: in function 'file_history'
	....local/share/nvim/lazy/diffview.nvim/plugin/diffview.lua:34: in function <....local/share/nvim/lazy/diffview.nvim/plugin/diffview.lua:27>

serranomorante · 2024-04-30T06:52:29Z

diffview-issue.webm

mikesmithgh · 2024-04-30T12:31:57Z

@serranomorante @LinoWhy @ctretyak thank you for pointing this out.

TL;DR;

The original error for this issue using deprecated calls no longer seems to appear in nvim nightly. You could try updating to the latest version of nvim nightly and revert back to sindrets/main.
I added a fix for flatten so this branch should work

My branch accidentally reverted to main that is why I did not see the error. So, that is one thing to point out. It seems like the latest nightly nvim may no longer be crashing due to the deprecated usage. So, you may not need to point to this branch unless you would like to test this functionality.

The issue appeared to be related to flatten.

vim.iter({ 1, { 2 }, { { 3 } } }):flatten():totable()
-- result: { 1, 2, { 3 } }

vs

vim.iter({ 1, { 2 }, { { 3 } } }):flatten(math.huge):totable()
-- result: { 1, 2, 3 }

flatten defaults to the depth of 1 so it was not fully flattening the list like vim.tbl_flatten. I added a fix for this by using math.huge as the depth so that is properly flattens the arguments.

Upstream has some issues with the latest release of NeoVim: - sindrets/diffview.nvim#492 - sindrets/diffview.nvim#489

closes sindrets#488

Unlike the `iter(...):flatten()` alternative, this handles lists with holes.

sindrets

Thank you!

I made a small change where I opted to use the old implementation of tbl_flatten() from Neovim because unlike the iter(...):flatten() alternative, it handles lists with holes.

mikesmithgh · 2024-05-19T00:01:38Z

Thank you!

I made a small change where I opted to use the old implementation of tbl_flatten() from Neovim because unlike the iter(...):flatten() alternative, it handles lists with holes.

Awesome! 😎

mikesmithgh mentioned this pull request Apr 24, 2024

[Bug] nightly nvim: DiffViewOpen fails to open #488

Closed

skoch13 mentioned this pull request Apr 25, 2024

fix: replace deprecated table methods for neovim v0.10 williamboman/mason.nvim#1690

Closed

yorickpeterse added a commit to yorickpeterse/dotfiles that referenced this pull request May 17, 2024

Temporarily switch to a fork of diffview

e6b77bf

Upstream has some issues with the latest release of NeoVim: - sindrets/diffview.nvim#492 - sindrets/diffview.nvim#489

mikesmithgh and others added 4 commits May 18, 2024 14:01

fix: replace vim.tbl_list with vim.islist for v0.10+

a5651aa

closes sindrets#488

fix: replace vim.tbl_flatten with Iter:flatten for v0.10+

0215474

closes sindrets#488

chore: fix util.flatten use math.huge depth

8397e11

use old 'tbl_flatten()' impl from neovim

1f4982f

Unlike the `iter(...):flatten()` alternative, this handles lists with holes.

sindrets force-pushed the fix-islist branch from 69c7f48 to 1f4982f Compare May 18, 2024 12:09

sindrets approved these changes May 18, 2024

View reviewed changes

sindrets merged commit 5532482 into sindrets:main May 18, 2024

sindrets mentioned this pull request May 18, 2024

Updated islist for Neovim 0.12+ #494

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: replace deprecated table operations for neovim v0.10 #489

fix: replace deprecated table operations for neovim v0.10 #489

mikesmithgh commented Apr 24, 2024 •

edited by sindrets

FunctionalHacker commented Apr 25, 2024

serranomorante commented Apr 29, 2024 •

edited

mikesmithgh commented Apr 30, 2024

ctretyak commented Apr 30, 2024 •

edited

LinoWhy commented Apr 30, 2024

serranomorante commented Apr 30, 2024

mikesmithgh commented Apr 30, 2024

sindrets left a comment

mikesmithgh commented May 19, 2024

fix: replace deprecated table operations for neovim v0.10 #489

fix: replace deprecated table operations for neovim v0.10 #489

Conversation

mikesmithgh commented Apr 24, 2024 • edited by sindrets

FunctionalHacker commented Apr 25, 2024

serranomorante commented Apr 29, 2024 • edited

mikesmithgh commented Apr 30, 2024

ctretyak commented Apr 30, 2024 • edited

LinoWhy commented Apr 30, 2024

serranomorante commented Apr 30, 2024

mikesmithgh commented Apr 30, 2024

sindrets left a comment

Choose a reason for hiding this comment

mikesmithgh commented May 19, 2024

mikesmithgh commented Apr 24, 2024 •

edited by sindrets

serranomorante commented Apr 29, 2024 •

edited

ctretyak commented Apr 30, 2024 •

edited