Skip to content

Commit

Permalink
fix ThePrimeagen#124
Browse files Browse the repository at this point in the history
  • Loading branch information
@bertverbessem
bertverbessem committed Aug 27, 2024
1 parent 9efb30f commit 497c31c
Showing 1 changed file with 129 additions and 130 deletions.
259 changes: 129 additions & 130 deletions lua/telescope/_extensions/git_worktree.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,28 @@ local conf = require("telescope.config").values
local git_worktree = require("git-worktree")

local get_worktree_path = function(prompt_bufnr)
local selection = action_state.get_selected_entry(prompt_bufnr)
return selection.path
local selection = action_state.get_selected_entry(prompt_bufnr)
return selection.path
end

local switch_worktree = function(prompt_bufnr)
local worktree_path = get_worktree_path(prompt_bufnr)
actions.close(prompt_bufnr)
if worktree_path ~= nil then
git_worktree.switch_worktree(worktree_path)
end
local worktree_path = get_worktree_path(prompt_bufnr)
actions.close(prompt_bufnr)
if worktree_path ~= nil then
git_worktree.switch_worktree(worktree_path)
end
end

local delete_worktree = function(prompt_bufnr, force)
local worktree_path = get_worktree_path(prompt_bufnr)
actions.close(prompt_bufnr)
if worktree_path ~= nil then
git_worktree.delete_worktree(worktree_path, force)
end
local worktree_path = get_worktree_path(prompt_bufnr)
actions.close(prompt_bufnr)
if worktree_path ~= nil then
git_worktree.delete_worktree(worktree_path, force)
end
end

local create_input_prompt = function(cb)

--[[
--[[
local window = Window.centered({
width = 30,
height = 1
Expand All @@ -51,140 +50,140 @@ local create_input_prompt = function(cb)
vim.nvim_command("startinsert")
end)
--]]
--
--

local subtree = vim.fn.input("Path to subtree > ")
cb(subtree)
local subtree = vim.fn.input("Path to subtree > ")
cb(subtree)
end

local create_worktree = function(opts)
opts = opts or {}
opts.attach_mappings = function()
actions.select_default:replace(
function(prompt_bufnr, _)
local selected_entry = action_state.get_selected_entry()
local current_line = action_state.get_current_line()
opts = opts or {}
opts.attach_mappings = function()
actions.select_default:replace(function(prompt_bufnr, _)
local selected_entry = action_state.get_selected_entry()
local current_line = action_state.get_current_line()

actions.close(prompt_bufnr)
actions.close(prompt_bufnr)

local branch = selected_entry ~= nil and
selected_entry.value or current_line
local branch = selected_entry ~= nil and selected_entry.value or current_line

if branch == nil then
return
end
if branch == nil then
return
end

create_input_prompt(function(name)
if name == "" then
name = branch
end
git_worktree.create_worktree(name, branch)
end)
end)
create_input_prompt(function(name)
if name == "" then
name = branch
end
git_worktree.create_worktree(name, branch)
end)
end)

-- do we need to replace other default maps?
-- do we need to replace other default maps?

return true
end
require("telescope.builtin").git_branches(opts)
return true
end
require("telescope.builtin").git_branches(opts)
end

local telescope_git_worktree = function(opts)
opts = opts or {}
local output = utils.get_os_command_output({"git", "worktree", "list"})
local results = {}
local widths = {
path = 0,
sha = 0,
branch = 0
opts = opts or {}
local output = utils.get_os_command_output({ "git", "worktree", "list" })
local results = {}
local widths = {
path = 0,
sha = 0,
branch = 0,
}

local parse_line = function(line)
local fields = vim.split(string.gsub(line, "%s+", " "), " ")
local entry = {
path = fields[1],
sha = fields[2],
branch = fields[3],
}

local parse_line = function(line)
local fields = vim.split(string.gsub(line, "%s+", " "), " ")
local entry = {
path = fields[1],
sha = fields[2],
branch = fields[3],
}

if entry.sha ~= "(bare)" then
local index = #results + 1
for key, val in pairs(widths) do
if key == 'path' then
new_path = utils.transform_path(opts, entry[key])
path_len = strings.strdisplaywidth(new_path or "")
widths[key] = math.max(val, path_len)
else
widths[key] = math.max(val, strings.strdisplaywidth(entry[key] or ""))
end
end

table.insert(results, index, entry)
if entry.sha ~= "(bare)" then
local index = #results + 1
for key, val in pairs(widths) do
if key == "path" then
new_path = utils.transform_path(opts, entry[key])
path_len = strings.strdisplaywidth(new_path or "")
widths[key] = math.max(val, path_len)
else
widths[key] = math.max(val, strings.strdisplaywidth(entry[key] or ""))
end
end
end

for _, line in ipairs(output) do
parse_line(line)
end

if #results == 0 then
return
end

local displayer = require("telescope.pickers.entry_display").create {
separator = " ",
items = {
{ width = widths.branch },
{ width = widths.path },
{ width = widths.sha },
},
}

local make_display = function(entry)
return displayer {
{ entry.branch, "TelescopeResultsIdentifier" },
{ utils.transform_path(opts, entry.path) },
{ entry.sha },
}
table.insert(results, index, entry)
end
end

for _, line in ipairs(output) do
parse_line(line)
end

if #results == 0 then
return
end

local displayer = require("telescope.pickers.entry_display").create({
separator = " ",
items = {
{ width = widths.branch },
{ width = widths.path },
{ width = widths.sha },
},
})

local make_display = function(entry)
local path, _ = utils.transform_path(opts, entry.path)
return displayer({
{ entry.branch, "TelescopeResultsIdentifier" },
{ path },
{ entry.sha },
})
end

pickers
.new(opts or {}, {
prompt_title = "Git Worktrees",
finder = finders.new_table({
results = results,
entry_maker = function(entry)
entry.value = entry.branch
entry.ordinal = entry.branch
entry.display = make_display
return entry
end,
}),
sorter = conf.generic_sorter(opts),
attach_mappings = function(_, map)
action_set.select:replace(switch_worktree)

map("i", "<c-d>", function(prompt_bufnr)
delete_worktree(prompt_bufnr)
end)
map("n", "<c-d>", function(prompt_bufnr)
delete_worktree(prompt_bufnr)
end)
map("i", "<c-D>", function(prompt_bufnr)
delete_worktree(prompt_bufnr, true)
end)
map("n", "<c-D>", function(prompt_bufnr)
delete_worktree(prompt_bufnr, true)
end)

pickers.new(opts or {}, {
prompt_title = "Git Worktrees",
finder = finders.new_table {
results = results,
entry_maker = function(entry)
entry.value = entry.branch
entry.ordinal = entry.branch
entry.display = make_display
return entry
end,
},
sorter = conf.generic_sorter(opts),
attach_mappings = function(_, map)
action_set.select:replace(switch_worktree)

map("i", "<c-d>", function(prompt_bufnr)
delete_worktree(prompt_bufnr)
end)
map("n", "<c-d>", function(prompt_bufnr)
delete_worktree(prompt_bufnr)
end)
map("i", "<c-D>", function(prompt_bufnr)
delete_worktree(prompt_bufnr, true)
end)
map("n", "<c-D>", function(prompt_bufnr)
delete_worktree(prompt_bufnr, true)
end)

return true
end
}):find()
return true
end,
})
:find()
end

return require("telescope").register_extension(
{
exports = {
git_worktrees = telescope_git_worktree,
create_git_worktree = create_worktree
}
})
return require("telescope").register_extension({
exports = {
git_worktrees = telescope_git_worktree,
create_git_worktree = create_worktree,
},
})

0 comments on commit 497c31c

Please sign in to comment.