itsscb/harpoon
1
0
Fork 0
mirror of https://github.com/ThePrimeagen/harpoon.git synced 2025-07-14 10:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #363 from roeeyn/fix/telescope-integration

Browse Source 
fix: telescope integration
This commit is contained in:
ThePrimeagen 2023-12-02 15:37:19 -07:00 committed by GitHub
commit f4a3a1eee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lua/telescope/_extensions/marks.lua
View File

@ -5,12 +5,11 @@ local finders = require("telescope.finders")
local pickers = require("telescope.pickers") local pickers = require("telescope.pickers")
local conf = require("telescope.config").values local conf = require("telescope.config").values
local harpoon = require("harpoon") local harpoon = require("harpoon")
local harpoon_mark = require("harpoon.mark")
local function filter_empty_string(list) local function filter_empty_string(list)
local next = {} local next = {}
for idx = 1, #list do for idx = 1, #list do
if list[idx].filename ~= "" then if list[idx].value ~= "" then
table.insert(next, list[idx]) table.insert(next, list[idx])
end end
end end
@ -20,9 +19,13 @@ end
local generate_new_finder = function() local generate_new_finder = function()
return finders.new_table({ return finders.new_table({
results = filter_empty_string(harpoon.get_mark_config().marks), results = filter_empty_string(harpoon:list().items),
entry_maker = function(entry) entry_maker = function(entry)
local line = entry.filename .. ":" .. entry.row .. ":" .. entry.col local line = entry.value
.. ":"
.. entry.context.row
.. ":"
.. entry.context.col
local displayer = entry_display.create({ local displayer = entry_display.create({
separator = " - ", separator = " - ",
items = { items = {
@ -43,7 +46,7 @@ local generate_new_finder = function()
display = make_display, display = make_display,
lnum = entry.row, lnum = entry.row,
col = entry.col, col = entry.col,
filename = entry.filename, filename = entry.value,
} }
end, end,
}) })
@ -61,7 +64,7 @@ local delete_harpoon_mark = function(prompt_bufnr)
end end
local selection = action_state.get_selected_entry() local selection = action_state.get_selected_entry()
harpoon_mark.rm_file(selection.filename) harpoon:list():remove(selection.value)
local function get_selections() local function get_selections()
local results = {} local results = {}
@ -73,7 +76,7 @@ local delete_harpoon_mark = function(prompt_bufnr)
local selections = get_selections() local selections = get_selections()
for _, current_selection in ipairs(selections) do for _, current_selection in ipairs(selections) do
harpoon_mark.rm_file(current_selection.filename) harpoon:list():remove(current_selection.value)
end end
local current_picker = action_state.get_current_picker(prompt_bufnr) local current_picker = action_state.get_current_picker(prompt_bufnr)
@ -82,13 +85,13 @@ end
local move_mark_up = function(prompt_bufnr) local move_mark_up = function(prompt_bufnr)
local selection = action_state.get_selected_entry() local selection = action_state.get_selected_entry()
local length = harpoon_mark.get_length() local length = harpoon:list():length()
if selection.index == length then if selection.index == length then
return return
end end
local mark_list = harpoon.get_mark_config().marks local mark_list = harpoon:list().items
table.remove(mark_list, selection.index) table.remove(mark_list, selection.index)
table.insert(mark_list, selection.index + 1, selection.value) table.insert(mark_list, selection.index + 1, selection.value)
@ -102,7 +105,7 @@ local move_mark_down = function(prompt_bufnr)
if selection.index == 1 then if selection.index == 1 then
return return
end end
local mark_list = harpoon.get_mark_config().marks local mark_list = harpoon:list().items
table.remove(mark_list, selection.index) table.remove(mark_list, selection.index)
table.insert(mark_list, selection.index - 1, selection.value) table.insert(mark_list, selection.index - 1, selection.value)
local current_picker = action_state.get_current_picker(prompt_bufnr) local current_picker = action_state.get_current_picker(prompt_bufnr)