fix(builtin): update after grapple rewrite (#46)

* fix: update grapple builtin for rewrite * fix: better guard in builtin for when plugin does not exist
cbochs · Mar 1, 2024 · 515c3d9 · 515c3d9
1 parent eacc582
commit 515c3d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lua/portal/builtin/grapple.lua b/lua/portal/builtin/grapple.lua
@@ -4,9 +4,9 @@ local function generator(opts, settings)
     local Iterator = require("portal.iterator")
     local Search = require("portal.search")
 
-    local ok, _ = require("grapple")
+    local ok, _ = pcall(require, "grapple")
     if not ok then
-        require("portal.log").error("Unable to load 'grapple'. Please ensure that grapple.nvim is installed.")
+        return require("portal.log").error("Unable to load 'grapple'. Please ensure that grapple.nvim is installed.")
     end
 
     local tags = require("grapple").tags()
@@ -37,10 +37,10 @@ local function generator(opts, settings)
         end
 
         local buffer
-        if vim.fn.bufexists(v.file_path) ~= 0 then
-            buffer = vim.fn.bufnr(v.file_path)
+        if vim.fn.bufexists(v.path) ~= 0 then
+            buffer = vim.fn.bufnr(v.path)
         else
-            buffer = vim.fn.bufadd(v.file_path)
+            buffer = vim.fn.bufadd(v.path)
         end
 
         if buffer == vim.fn.bufnr() then
@@ -52,10 +52,10 @@ local function generator(opts, settings)
             buffer = buffer,
             cursor = { row = v.cursor[1], col = v.cursor[2] },
             callback = function(content)
-                require("grapple").select({ key = content.extra.key })
+                require("grapple").select({ path = content.extra.path })
             end,
             extra = {
-                key = v.key,
+                path = v.path,
             },
         })
     end)

diff --git a/lua/portal/builtin/harpoon.lua b/lua/portal/builtin/harpoon.lua
@@ -4,9 +4,9 @@ local function generator(opts, settings)
     local Iterator = require("portal.iterator")
     local Search = require("portal.search")
 
-    local ok, _ = require("harpoon")
+    local ok, _ = pcall(require, "harpoon")
     if not ok then
-        require("portal.log").error("Unable to load 'harpoon'. Please ensure that harpoon is installed.")
+        return require("portal.log").error("Unable to load 'harpoon'. Please ensure that harpoon is installed.")
     end
 
     local marks = require("harpoon").get_mark_config().marks