itsscb/harpoon
1
0
Fork 0
mirror of https://github.com/ThePrimeagen/harpoon.git synced 2025-07-14 01:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): Navigation with enter on menu

Browse Source
This commit is contained in:
ThePrimeagen 2021-05-11 10:11:46 -06:00
parent a96cafc56d
commit 0572fa81d3
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua/harpoon/term.lua
View File

@ -1,5 +1,4 @@
local harpoon = require("harpoon") local harpoon = require("harpoon")
local Path = require("plenary.path")
local log = require("harpoon.dev").log local log = require("harpoon.dev").log
local M = {} local M = {}
@ -28,10 +27,6 @@ local function create_terminal()
return buf_id, term_id return buf_id, term_id
end end
function getCmd(idx)
return
end
local function find_terminal(idx) local function find_terminal(idx)
log.trace("_find_terminal(): Terminal:", idx) log.trace("_find_terminal(): Terminal:", idx)
local term_handle = terminals[idx] local term_handle = terminals[idx]

33
lua/harpoon/ui.lua
View File

@ -8,6 +8,22 @@ local M = {}
Harpoon_win_id = nil Harpoon_win_id = nil
Harpoon_bufh = nil Harpoon_bufh = nil
-- We save before we close because we use the state of the buffer as the list
-- of items.
local function close_menu(force_save)
force_save = force_save or false
local global_config = harpoon.get_global_settings()
if global_config.save_on_toggle or force_save then
require("harpoon.ui").on_menu_save()
end
vim.api.nvim_win_close(Harpoon_win_id, true)
Harpoon_win_id = nil
Harpoon_bufh = nil
end
local function create_window() local function create_window()
log.trace("_create_window()") log.trace("_create_window()")
local config = harpoon.get_menu_config() local config = harpoon.get_menu_config()
@ -54,17 +70,7 @@ end
M.toggle_quick_menu = function() M.toggle_quick_menu = function()
log.trace("toggle_quick_menu()") log.trace("toggle_quick_menu()")
if Harpoon_win_id ~= nil and vim.api.nvim_win_is_valid(Harpoon_win_id) then if Harpoon_win_id ~= nil and vim.api.nvim_win_is_valid(Harpoon_win_id) then
local global_config = harpoon.get_global_settings() close_menu()
if global_config.save_on_toggle then
require("harpoon.ui").on_menu_save()
end
vim.api.nvim_win_close(Harpoon_win_id, true)
Harpoon_win_id = nil
Harpoon_bufh = nil
return return
end end
@ -87,13 +93,14 @@ M.toggle_quick_menu = function()
vim.api.nvim_buf_set_option(Harpoon_bufh, "filetype", "harpoon") vim.api.nvim_buf_set_option(Harpoon_bufh, "filetype", "harpoon")
vim.api.nvim_buf_set_option(Harpoon_bufh, "buftype", "acwrite") vim.api.nvim_buf_set_option(Harpoon_bufh, "buftype", "acwrite")
vim.api.nvim_buf_set_option(Harpoon_bufh, "bufhidden", "delete") vim.api.nvim_buf_set_option(Harpoon_bufh, "bufhidden", "delete")
vim.api.nvim_buf_set_keymap(Harpoon_bufh, "n", "<CR>", ":lua require('harpoon.ui').on_norm_enter()<CR>", {}) vim.api.nvim_buf_set_keymap(Harpoon_bufh, "n", "<CR>", ":lua require('harpoon.ui').select_menu_item()<CR>", {})
vim.cmd(string.format("autocmd BufWriteCmd <buffer=%s> :lua require('harpoon.ui').on_menu_save()", Harpoon_bufh)) vim.cmd(string.format("autocmd BufWriteCmd <buffer=%s> :lua require('harpoon.ui').on_menu_save()", Harpoon_bufh))
vim.cmd(string.format("autocmd BufModifiedSet <buffer=%s> set nomodified", Harpoon_bufh)) vim.cmd(string.format("autocmd BufModifiedSet <buffer=%s> set nomodified", Harpoon_bufh))
end end
M.on_norm_enter = function() M.select_menu_item = function()
local idx = vim.fn.line('.') local idx = vim.fn.line('.')
close_menu(true)
M.nav_file(idx) M.nav_file(idx)
end end