Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: grapple.nvim integration #29

Merged
merged 4 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,34 @@ require("portal.builtin").changelist.tunnel()

</details>

#### `grapple`

Filter, match, and iterate over tagged files from [harpoon](https://github.com/cbochs/grapple).

**Defaults**

- **`opts.start`**: `1`
- **`opts.direction`**: `"forward"`
- **`opts.max_results`**: `#settings.labels`

**Content**

- **`type`**: `"harpoon"`
- **`buffer`**: the tags's `bufnr`
- **`cursor`**: the tags's `row` and `col`
- **`select`**: uses `grapple#select`
- **`key`**: the tags's key

<details>
<summary><b>Examples</b></summary>

```lua
-- Open a default search for grapples's tags
require("portal.builtin").grapple.tunnel()
```

</details>

#### `harpoon`

Filter, match, and iterate over marked files from [harpoon](https://github.com/ThePrimeagen/harpoon).
Expand All @@ -200,7 +228,7 @@ Filter, match, and iterate over marked files from [harpoon](https://github.com/T
- **`type`**: `"harpoon"`
- **`buffer`**: the mark's `bufnr`
- **`cursor`**: the mark's `row` and `col`
- **`select`**: uses `harpoon.ui#nav_file` to select
- **`select`**: uses `harpoon.ui#nav_file`
- **`index`**: the mark's index

<details>
Expand Down
75 changes: 75 additions & 0 deletions lua/portal/builtin/grapple.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---@type Portal.QueryGenerator
local function generator(opts, settings)
local Iterator = require("portal.iterator")
local Search = require("portal.search")

local ok, _ = require("grapple")
if not ok then
require("portal.log").error("Unable to load 'grapple'. Please ensure that grapple.nvim is installed.")
end

local tags = require("grapple").tags()

opts = vim.tbl_extend("force", {
direction = "forward",
max_results = #settings.labels,
}, opts or {})

if settings.max_results then
opts.max_results = math.min(opts.max_results, settings.max_results)
end

-- stylua: ignore
local iter = Iterator:new(tags)
:take(settings.lookback)

if opts.start then
iter = iter:start_at(opts.start)
end
if opts.direction == Search.direction.backward then
iter = iter:reverse()
end

iter = iter:map(function(v, _)
local buffer
if vim.fn.bufexists(v.file_path) ~= 0 then
buffer = vim.fn.bufnr(v.file_path)
else
buffer = vim.fn.bufadd(v.file_path)
end

if buffer == vim.fn.bufnr() then
return nil
end

return {
type = "grapple",
buffer = buffer,
cursor = { row = v.cursor[1], col = v.cursor[2] },
select = function(content)
require("grapple").select({ key = content.key })
end,
key = v.key,
}
end)

iter = iter:filter(function(v)
return vim.api.nvim_buf_is_valid(v.buffer)
end)
if settings.filter then
iter = iter:filter(settings.filter)
end
if opts.filter then
iter = iter:filter(opts.filter)
end
if not opts.slots then
iter = iter:take(opts.max_results)
end

return {
source = iter,
slots = opts.slots,
}
end

return generator
2 changes: 1 addition & 1 deletion lua/portal/builtin/harpoon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local function generator(opts, settings)

local ok, _ = require("harpoon")
if not ok then
error("harpoon is not installed")
require("portal.log").error("Unable to load 'harpoon'. Please ensure that harpoon is installed.")
end

local marks = require("harpoon").get_mark_config().marks
Expand Down
1 change: 1 addition & 0 deletions lua/portal/commands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function Commands.create()
complete = function(_, cmd_line, _)
local builtins = {
"changelist",
"grapple",
"harpoon",
"jumplist",
"quickfix",
Expand Down