NeogitOrg / neogit

An interactive and powerful Git interface for Neovim, inspired by Magit
MIT License
3.62k stars 218 forks source link

...al/share/nvim/lazy/neogit/lua/neogit/lib/item_filter.lua:18: bad argument #1 to 'new' (table expected, got boolean) #1380

Closed cameronr closed 2 weeks ago

cameronr commented 2 weeks ago

Description

Error item_filter.lua:18: bad argument #1 to 'new' (table expected, got boolean) when staging file from DiffView.

Neovim version

NVIM v0.10.0 Build type: Release LuaJIT 2.1.1716656478

Operating system and version

Sonoma 14.1

Steps to reproduce

  1. nvim -nu minimal.lua
  2. Have a git repo with unstaged changes 3.. :Neogit
  3. Go to unstaged changes and diff unstaged to open DiffView
  4. Press 's' to stage one of the changes

Expected behavior

The file is staged and no error is generated

Actual behavior

The following error is generated and the DiffView screen shows inconsistent result and may not function correctly. The file does actually get staged.

E5108: Error executing lua: /Users/cam/.min/plugins/plenary/lua/plenary/async/async.lua:18: The coroutine failed with this message: /Users/cam/.min/plugins/plenary/lua/plenary/async/async.lua:18: The coroutine failed with
 this message: ...s/cam/.min/plugins/neogit/lua/neogit/lib/item_filter.lua:18: bad argument #1 to 'new' (table expected, got boolean)
stack traceback:
        [C]: in function 'error'
        /Users/cam/.min/plugins/plenary/lua/plenary/async/async.lua:18: in function 'callback_or_next'
        /Users/cam/.min/plugins/plenary/lua/plenary/async/async.lua:45: in function 'step'
        /Users/cam/.min/plugins/plenary/lua/plenary/async/async.lua:48: in function 'execute'
        /Users/cam/.min/plugins/plenary/lua/plenary/async/async.lua:118: in function 'call'
        /Users/cam/.min/plugins/diffview/lua/diffview/events.lua:171: in function 'filter_call'
        /Users/cam/.min/plugins/diffview/lua/diffview/events.lua:196: in function 'emit'
        ...ins/diffview/lua/diffview/scene/views/diff/listeners.lua:189: in function 'call'
        /Users/cam/.min/plugins/diffview/lua/diffview/events.lua:171: in function 'filter_call'
        /Users/cam/.min/plugins/diffview/lua/diffview/events.lua:196: in function 'fn'
        /Users/cam/.min/plugins/diffview/lua/diffview/init.lua:256: in function '_emit'
        /Users/cam/.min/plugins/diffview/lua/diffview/init.lua:270: in function 'emit'
        /Users/cam/.min/plugins/diffview/lua/diffview/actions.lua:652: in function </Users/cam/.min/plugins/diffview/lua/diffview/actions.lua:651>

I think this is because the code in diffview.lua:105 sets incorrectly sets update_diffs to true:

https://github.com/NeogitOrg/neogit/blob/d55898fe64e3b3d87a0b3b38ddc9c3d57526ff48/lua/neogit/integrations/diffview.lua#L103-L106

Should that maybe be:

      status.instance():dispatch_refresh({ update_diffs = { "staged:*" } }, "on_files_staged")

That does seem to work for me (at least in my limited testing).

Minimal config

-- NOTE: See the end of this file if you are reporting an issue, etc. Ignore all the "scary" functions up top, those are
-- used for setup and other operations.
local M = {}

local base_root_path = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h") .. "/.min"
function M.root(path)
  return base_root_path .. "/" .. (path or "")
end

function M.load_plugin(plugin_name, plugin_url)
  local package_root = M.root("plugins/")
  local install_destination = package_root .. plugin_name
  vim.opt.runtimepath:append(install_destination)

  if not vim.loop.fs_stat(package_root) then
    vim.fn.mkdir(package_root, "p")
  end

  if not vim.loop.fs_stat(install_destination) then
    print(string.format("> Downloading plugin '%s' to '%s'", plugin_name, install_destination))
    vim.fn.system({
      "git",
      "clone",
      "--depth=1",
      plugin_url,
      install_destination,
    })
    if vim.v.shell_error > 0 then
      error(string.format("> Failed to clone plugin: '%s' in '%s'!", plugin_name, install_destination),
        vim.log.levels.ERROR)
    end
  end
end

---@alias PluginName string The plugin name, will be used as part of the git clone destination
---@alias PluginUrl string The git url at which a plugin is located, can be a path. See https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols for details
---@alias MinPlugins table<PluginName, PluginUrl>

---Do the initial setup. Downloads plugins, ensures the minimal init does not pollute the filesystem by keeping
---everything self contained to the CWD of the minimal init file. Run prior to running tests, reproducing issues, etc.
---@param plugins? table<PluginName, PluginUrl>
function M.setup(plugins)
  vim.opt.packpath = {}                      -- Empty the package path so we use only the plugins specified
  vim.opt.runtimepath:append(M.root(".min")) -- Ensure the runtime detects the root min dir

  -- Install required plugins
  if plugins ~= nil then
    for plugin_name, plugin_url in pairs(plugins) do
      M.load_plugin(plugin_name, plugin_url)
    end
  end

  vim.env.XDG_CONFIG_HOME = M.root("xdg/config")
  vim.env.XDG_DATA_HOME = M.root("xdg/data")
  vim.env.XDG_STATE_HOME = M.root("xdg/state")
  vim.env.XDG_CACHE_HOME = M.root("xdg/cache")

  -- NOTE: Cleanup the xdg cache on exit so new runs of the minimal init doesn't share any previous state, e.g. shada
  vim.api.nvim_create_autocmd("VimLeave", {
    callback = function()
      vim.fn.system({
        "rm",
        "-r",
        "-f",
        M.root("xdg")
      })
    end
  })
end

-- NOTE: If you have additional plugins you need to install to reproduce your issue, include them in the plugins
-- table within the setup call below.
M.setup({
  plenary = "https://github.com/nvim-lua/plenary.nvim.git",
  telescope = "https://github.com/nvim-telescope/telescope.nvim",
  diffview = "https://github.com/sindrets/diffview.nvim",
  neogit = "https://github.com/NeogitOrg/neogit"
})
-- WARN: Do all plugin setup, test runs, reproductions, etc. AFTER calling setup with a list of plugins!
-- Basically, do all that stuff AFTER this line.
require("neogit").setup({}) -- For instance, setup Neogit