init.lua @ 9e0160f

M lua/plugins/lualine.lua

@@ -36,8 +36,9 @@ end,
   },
   harpoon_status = {
     function()
-      return require("scratch.harpoon_status").lualine()
+      return require("scratch.harpoon_status").status():reverse()
     end,
+    cond = require("scratch.harpoon_status").exists,
   },
 }
 

M lua/scratch/gotest_switcher.lua

@@ -2,8 +2,7 @@ local gotests = {}
 
 function gotests.switch()
   local bufnr = vim.api.nvim_get_current_buf()
-  local fname = vim.api.nvim_buf_get_name(bufnr)
-  local fname_parts = vim.split(fname, "/")
+  local fname_parts = vim.split(vim.api.nvim_buf_get_name(bufnr), "/")
   local test_fname = fname_parts[#fname_parts]
   if test_fname:find "_test.go" then
     test_fname = test_fname:gsub("_test.go", ".go")

M lua/scratch/harpoon_status.lua

@@ -8,8 +8,7 @@ end
 
 ---@return string
 function M.status()
-  local h = require "harpoon"
-  local list = h:list()
+  local list = require("harpoon"):list()
   local rdir = list.config:get_root_dir()
   local cfpath = vim.api.nvim_buf_get_name(0)
   local len = list:length()
@@ -29,13 +28,9 @@
   return table.concat(status, " ")
 end
 
----@return string
-function M.lualine()
-  local harpoon_loaded = package.loaded["harpoon"] ~= nil
-  if not harpoon_loaded then
-    return ""
-  end
-  return M.status():reverse()
+---@return boolean
+function M.exists()
+  return package.loaded["harpoon"] ~= nil
 end
 
 function M.debug()