From 4548a7a3c9ac584c4557d1285c9fab388febce2a Mon Sep 17 00:00:00 2001
From: ThePrimeagen <mpaulson@netflix.com>
Date: Wed, 7 Apr 2021 14:42:36 -0600
Subject: [PATCH] feat(worktree): harpoon now works well with worktrees

---
 lua/harpoon/init.lua | 6 ++++--
 lua/harpoon/mark.lua | 2 --
 lua/harpoon/ui.lua   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/harpoon/init.lua b/lua/harpoon/init.lua
index 01debff..c5c28c8 100644
--- a/lua/harpoon/init.lua
+++ b/lua/harpoon/init.lua
@@ -85,6 +85,8 @@ local function ensure_correct_config(config)
 
         marks[idx].filename = utils.normalize_path(mark.filename)
     end
+
+    return config
 end
 
 local function expand_dir(config)
@@ -141,11 +143,11 @@ M.setup = function(config)
 end
 
 M.get_term_config = function()
-    return HarpoonConfig.projects[vim.loop.cwd()].term
+    return ensure_correct_config(HarpoonConfig).projects[vim.loop.cwd()].term
 end
 
 M.get_mark_config = function()
-    return HarpoonConfig.projects[vim.loop.cwd()].mark
+    return ensure_correct_config(HarpoonConfig).projects[vim.loop.cwd()].mark
 end
 
 M.get_menu_config = function()
diff --git a/lua/harpoon/mark.lua b/lua/harpoon/mark.lua
index ac027be..77e080c 100644
--- a/lua/harpoon/mark.lua
+++ b/lua/harpoon/mark.lua
@@ -259,8 +259,6 @@ M.toggle_file = function(file_name_or_buf_id)
     end
 end
 
-M.to_quickfix_list()
-
 M.get_current_index = function()
     return M.get_index_of(vim.fn.bufname(vim.fn.bufnr()))
 end
diff --git a/lua/harpoon/ui.lua b/lua/harpoon/ui.lua
index 0ea1f6e..eafa0c6 100644
--- a/lua/harpoon/ui.lua
+++ b/lua/harpoon/ui.lua
@@ -95,7 +95,7 @@ M.nav_file = function(id)
     end
 
     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)
 
     vim.api.nvim_set_current_buf(buf_id)