From 6b0249952f586a8d1cf347e9d1f9fdc9523b2683 Mon Sep 17 00:00:00 2001 From: Gustav Eikaas Date: Wed, 27 Nov 2024 20:01:25 +0100 Subject: [PATCH 1/2] fix(telescope): worktree list crashing --- lua/telescope/_extensions/git_worktree.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/telescope/_extensions/git_worktree.lua b/lua/telescope/_extensions/git_worktree.lua index 706cd2b..4084523 100644 --- a/lua/telescope/_extensions/git_worktree.lua +++ b/lua/telescope/_extensions/git_worktree.lua @@ -76,15 +76,14 @@ local delete_worktree = function(prompt_bufnr) local worktree_path = get_worktree_path(prompt_bufnr) actions.close(prompt_bufnr) if worktree_path ~= nil then - git_worktree.delete_worktree(worktree_path, force_next_deletion, { - on_failure = delete_failure_handler, - on_success = delete_success_handler - }) + git_worktree.delete_worktree(worktree_path, force_next_deletion, { + on_failure = delete_failure_handler, + on_success = delete_success_handler + }) end end local create_input_prompt = function(cb) - --[[ local window = Window.centered({ width = 30, @@ -143,7 +142,7 @@ end local telescope_git_worktree = function(opts) opts = opts or {} - local output = utils.get_os_command_output({"git", "worktree", "list"}) + local output = utils.get_os_command_output({ "git", "worktree", "list" }) local results = {} local widths = { path = 0, @@ -193,9 +192,10 @@ local telescope_git_worktree = function(opts) } local make_display = function(entry) + local path = utils.transform_path(opts, entry.path) return displayer { { entry.branch, "TelescopeResultsIdentifier" }, - { utils.transform_path(opts, entry.path) }, + { path }, { entry.sha }, } end @@ -226,7 +226,7 @@ local telescope_git_worktree = function(opts) end return require("telescope").register_extension( - { + { exports = { git_worktree = telescope_git_worktree, git_worktrees = telescope_git_worktree, From e29b32e746798e36d09e7db64300f9e015b8c8e8 Mon Sep 17 00:00:00 2001 From: Gustav Eikaas Date: Wed, 27 Nov 2024 20:09:32 +0100 Subject: [PATCH 2/2] style: remove unintended formatting changes --- lua/telescope/_extensions/git_worktree.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lua/telescope/_extensions/git_worktree.lua b/lua/telescope/_extensions/git_worktree.lua index 4084523..3adb3b1 100644 --- a/lua/telescope/_extensions/git_worktree.lua +++ b/lua/telescope/_extensions/git_worktree.lua @@ -76,14 +76,15 @@ local delete_worktree = function(prompt_bufnr) local worktree_path = get_worktree_path(prompt_bufnr) actions.close(prompt_bufnr) if worktree_path ~= nil then - git_worktree.delete_worktree(worktree_path, force_next_deletion, { - on_failure = delete_failure_handler, - on_success = delete_success_handler - }) + git_worktree.delete_worktree(worktree_path, force_next_deletion, { + on_failure = delete_failure_handler, + on_success = delete_success_handler + }) end end local create_input_prompt = function(cb) + --[[ local window = Window.centered({ width = 30, @@ -142,7 +143,7 @@ end local telescope_git_worktree = function(opts) opts = opts or {} - local output = utils.get_os_command_output({ "git", "worktree", "list" }) + local output = utils.get_os_command_output({"git", "worktree", "list"}) local results = {} local widths = { path = 0, @@ -226,7 +227,7 @@ local telescope_git_worktree = function(opts) end return require("telescope").register_extension( - { + { exports = { git_worktree = telescope_git_worktree, git_worktrees = telescope_git_worktree,