NeogitOrg / neogit

An interactive and powerful Git interface for Neovim, inspired by Magit

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Status - Mapping of `o` is broken now

mangelozzi opened this issue · comments

Description

With the status pop up, I map o to open. When I press o to open a file, its opens the browser instead, even though I have configured it to open. It used to work.
I love this project, but by far the largest pain point, is every time I update my plugins, some mapping in neogit breaks. I really long for some stabilization around hotkeys. I love this project, is there a way to not buy into the default hotkeys, and only define the one's one requires. Vim motion hotkeys often get assigned to new features, which means vim commands break when new features are added. E.g. I also just found out yy not longer works to yank a line. It's really handle to nav a codebase based on the git state of a repo, not just perform git actions on it, and thats where the power of vim and neogit come together. Just found use_default_keymaps = true has been added, awesomeness thank you!!!

Neovim version

NVIM v0.11.0-dev-311+g9dc09a4cd
Build type: RelWithDebInfo
LuaJIT 2.1.1716656478
Run "nvim -V1 -v" for more info

Operating system and version

Debian 11

Steps to reproduce

local neogit = require('neogit')
neogit.setup {}

-- Settings, refer to: https://github.com/TimUntersberger/neogit
require("neogit").setup {
    use_default_keymaps = false,
}

Expected behavior

GoToFile

Actual behavior

Open's one file browser

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({
    use_default_keymaps = false,
    mappings = {
        popup = {
            ["?"] = "HelpPopup",
        },
        status = {
            ["q"] = "Close",
            ["<ESC>"] = "Close", -- Michael
            ["1"] = "Depth1",
            ["2"] = "Depth2",
            ["3"] = "Depth3",
            ["4"] = "Depth4",
            ["<tab>"] = "Toggle",
            ["x"] = "Discard",
            ["s"] = "Stage",
            ["u"] = "Unstage",
            ["$"] = "CommandHistory",
            ["<c-r>"] = "RefreshBuffer",
            ["<enter>"] = "GoToFile",
            ["o"] = "GoToFile", -- Michael
            ["<c-v>"] = "VSplitOpen", -- Michael
            ["<c-x>"] = "SplitOpen", -- Michael
            ["<c-t>"] = "TabOpen", -- "TabOpen",
            ["<c-p>"] = "GoToPreviousHunkHeader",
            ["<c-n>"] = "GoToNextHunkHeader"
        }
    }
}) -- For instance, setup Neogit

Yeah, the hotkeys thing has been a frequent complaint.. It'd be really cool to build something like Telescope has, someday :)

In the meantime, this is now fixed on master.