NeogitOrg / neogit

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

Error on quit 'q' operation #1214

Closed skoch13 closed 5 months ago

skoch13 commented 5 months ago

Description

Whenever I want to close neogit tab with default q shortcut it results in error. Once errored neogit is unusable, so I have to reopen neovim.

Neovim version

NVIM v0.10.0-dev-2675+g2955c921c Build type: RelWithDebInfo LuaJIT 2.1.1710088188

Operating system and version

macOS 14.4

Steps to reproduce

  1. use neogit nightly
  2. open neogit tab
  3. attempt to close neogit tab

Expected behavior

No response

Actual behavior

  Error  15:22:04 msg_show.lua_error E5108: Error executing lua ...hare/nvim/lazy/neogit/lua/neogit/buffers/status/init.lua:1112: attempt to index field 'instance' (a nil value)
stack traceback:
    ...hare/nvim/lazy/neogit/lua/neogit/buffers/status/init.lua:1112: in function 'close'
    ...hare/nvim/lazy/neogit/lua/neogit/buffers/status/init.lua:387: in function 'cb'
    .../.local/share/nvim/lazy/neogit/lua/neogit/lib/buffer.lua:548: in function <.../.local/share/nvim/lazy/neogit/lua/neogit/lib/buffer.lua:547>
    ...are/nvim/lazy/neogit/lua/neogit/lib/mappings_manager.lua:14: in function 'invoke'
    [string ":lua"]:1: in main chunk

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
CKolkey commented 5 months ago

Thanks, I'll have a look. Just double check you're on the latest commit - I pushed some changes about an hour ago

skoch13 commented 5 months ago

I’m(3b9269e). Thank you for looking into it!

CKolkey commented 5 months ago

Ahh, you don't have the file watcher turned on. I should guard against that.

skoch13 commented 5 months ago

hm, that's strange:

16:28:19 msg_show ^I...h13/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:359: in function <...h13/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:325>

which also breaks neogit

CKolkey commented 5 months ago

Oh, it defaults to disabled because I forgot to change that. It's not exactly experimental anymore... but was, for a bit

Filewatcher is a way to "push" updates to neogit. Otherwise we only "pull" after loading/running actions.

Last error seems... no clue. Could you type :messages and capture the rest of it?

skoch13 commented 5 months ago

If I get it right, here it the full stacktrace:

vim/_editor.lua:0: nvim_exec2(): Vim(fold):E350: Cannot create fold with current 'foldmethod'
stack traceback:
    [C]: in function 'nvim_exec2'
    vim/_editor.lua: in function 'cmd'
    .../.local/share/nvim/lazy/neogit/lua/neogit/lib/buffer.lua:343: in function 'create_fold'
    .../.local/share/nvim/lazy/neogit/lua/neogit/lib/buffer.lua:180: in function 'set_folds'
    ....local/share/nvim/lazy/neogit/lua/neogit/lib/ui/init.lua:611: in function 'update'
    ....local/share/nvim/lazy/neogit/lua/neogit/lib/ui/init.lua:588: in function 'render'
    .../.local/share/nvim/lazy/neogit/lua/neogit/lib/buffer.lua:561: in function 'create'
    ...hare/nvim/lazy/neogit/lua/neogit/buffers/status/init.lua:78: in function 'open'
    /Users/skoch13/.local/share/nvim/lazy/neogit/lua/neogit.lua:118: in function 'callback'
    ...share/nvim/lazy/neogit/lua/neogit/lib/git/repository.lua:75: in function 'callback'
    ...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:25: in function 'callback_or_next'
    ...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:45: in function 'saved_callback'
    ...are/nvim/lazy/plenary.nvim/lua/plenary/async/control.lua:126: in function 'tx'
    .../share/nvim/lazy/plenary.nvim/lua/plenary/async/util.lua:67: in function 'callback'
    ...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:25: in function 'callback_or_next'
    ...share/nvim/lazy/plenary.nvim/lua/plenary/async/async.lua:45: in function 'cb'
    ...h13/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:359: in function <...h13/.local/share/nvim/lazy/neogit/lua/neogit/process.lua:325>
CKolkey commented 5 months ago

Ah, ok. Just pushed some changes. Lemme know if the issues persist.

skoch13 commented 5 months ago

Oh yes, thank you. My main pain for this week has finally been resolved ❤️

CKolkey commented 5 months ago

Awesome. Thanks for letting me know :)