mirror of
https://github.com/ThePrimeagen/harpoon.git
synced 2025-07-13 17:40:25 +00:00
feat(worktree): harpoon now works well with worktrees
This commit is contained in:
parent
44810f677d
commit
4548a7a3c9
@ -85,6 +85,8 @@ local function ensure_correct_config(config)
|
|||||||
|
|
||||||
marks[idx].filename = utils.normalize_path(mark.filename)
|
marks[idx].filename = utils.normalize_path(mark.filename)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
return config
|
||||||
end
|
end
|
||||||
|
|
||||||
local function expand_dir(config)
|
local function expand_dir(config)
|
||||||
@ -141,11 +143,11 @@ M.setup = function(config)
|
|||||||
end
|
end
|
||||||
|
|
||||||
M.get_term_config = function()
|
M.get_term_config = function()
|
||||||
return HarpoonConfig.projects[vim.loop.cwd()].term
|
return ensure_correct_config(HarpoonConfig).projects[vim.loop.cwd()].term
|
||||||
end
|
end
|
||||||
|
|
||||||
M.get_mark_config = function()
|
M.get_mark_config = function()
|
||||||
return HarpoonConfig.projects[vim.loop.cwd()].mark
|
return ensure_correct_config(HarpoonConfig).projects[vim.loop.cwd()].mark
|
||||||
end
|
end
|
||||||
|
|
||||||
M.get_menu_config = function()
|
M.get_menu_config = function()
|
||||||
|
@ -259,8 +259,6 @@ M.toggle_file = function(file_name_or_buf_id)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
M.to_quickfix_list()
|
|
||||||
|
|
||||||
M.get_current_index = function()
|
M.get_current_index = function()
|
||||||
return M.get_index_of(vim.fn.bufname(vim.fn.bufnr()))
|
return M.get_index_of(vim.fn.bufname(vim.fn.bufnr()))
|
||||||
end
|
end
|
||||||
|
@ -95,7 +95,7 @@ M.nav_file = function(id)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local mark = Marked.get_marked_file(idx)
|
local mark = Marked.get_marked_file(idx)
|
||||||
local buf_id = vim.fn.bufnr(mark.filename)
|
local buf_id = vim.fn.bufnr(mark.filename, true)
|
||||||
local set_row = not vim.api.nvim_buf_is_loaded(buf_id)
|
local set_row = not vim.api.nvim_buf_is_loaded(buf_id)
|
||||||
|
|
||||||
vim.api.nvim_set_current_buf(buf_id)
|
vim.api.nvim_set_current_buf(buf_id)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user