cleanup: extract functionality into dedicated module commands

lua/custom/utils/telescope.lua

@@ -1,18 +1,14 @@
 local M = {}
 
 -- builtin telescope modules
+local utils = require 'telescope.utils'
 local actions = require 'telescope.actions'
 local builtin = require 'telescope.builtin'
+local action_state = require 'telescope.actions.state'
 
-function M.git_stash_mappings()
-  builtin.git_stash {
-    attach_mappings = function(_, map)
-      -- builtin telescope modules
-      local utils = require 'telescope.utils'
-      local action_state = require 'telescope.actions.state'
-
-      -- Reference: https://github.com/nvim-telescope/telescope.nvim/blob/master/lua/telescope/actions/init.lua#L587
-      local function git_apply_stash(prompt_bufnr)
+--- Reference: [telescope.actions.git_apply_stash](https://github.com/nvim-telescope/telescope.nvim/blob/master/lua/telescope/actions/init.lua#L587)
+--- @param prompt_bufnr number: The prompt buffer number from Telescope.
+local function git_apply_stash(prompt_bufnr)
   local selection = action_state.get_selected_entry()
   if selection == nil then
     utils.__warn_no_selection 'actions.git_apply_stash'
@@ -33,20 +29,25 @@ function M.git_stash_mappings()
       level = 'ERROR',
     })
   end
-      end
-      actions.select_default:replace(git_apply_stash)
+end
 
-      -- custom function to match stash index inside curly brackets
-      local function match_bracket(str, arr)
-        string.gsub(str, '{(.-)}', function(match)
+--- Custom function to match any unique characters inside a pattern.
+--- @param str string: The input string to scan.
+--- @param pat string: The pattern to search for.
+--- @param arr table: The output table to append to.
+function M.match_to_list(str, pat, arr)
+  string.gsub(str, pat, function(match)
     -- do not insert existing entry into index list
     if not vim.list_contains(arr, match) then
       table.insert(arr, match)
     end
   end)
-      end
+end
 
-      local function git_drop_stash(prompt_bufnr)
+--- Get all selected entries in the Telescope picker and extract stash indices.
+--- @param prompt_bufnr number: The prompt buffer number from Telescope.
+--- @return table|false: A list of stash indices or false if nothing is selected.
+function M.get_stash_selections(prompt_bufnr)
   local picker = action_state.get_current_picker(prompt_bufnr)
   local selection = picker:get_multi_selection()
 
@@ -54,7 +55,7 @@ function M.git_stash_mappings()
   -- scan all multi_selection entries
   for _, entry in ipairs(selection) do
     local value = entry.value
-          match_bracket(value, stashes)
+    M.match_to_list(value, '{(.-)}', stashes)
   end
 
   -- scan single selected entry
@@ -66,10 +67,16 @@ function M.git_stash_mappings()
       vim.log.levels.WARN,
       { title = 'telescope.nvim' }
     )
-          return
+    return false
   end
-        match_bracket(entry.value, stashes)
+  M.match_to_list(entry.value, '{(.-)}', stashes)
 
+  return stashes
+end
+
+--- Drop git stashes by their indices.
+--- @param stashes table: A list of stash indices to drop.
+function M.git_drop_stash(stashes)
   local success = {}
   for idx = #stashes, 1, -1 do
     -- execute git command in os
@@ -90,10 +97,26 @@ function M.git_stash_mappings()
 
   -- extracted from telescope.utils.notify:
   vim.notify(string.format("dropping: 'stash@{%s}' ", table.concat(success, ', ')), vim.log.levels.INFO, { title = 'telescope.nvim' })
+end
 
-        -- refresh picker
+--- Extend the Telescope `git_stash` picker with custom mappings.
+function M.git_stash()
+  builtin.git_stash {
+    attach_mappings = function(_, map)
+      actions.select_default:replace(git_apply_stash)
+
+      --- @param prompt_bufnr number: The prompt buffer number from Telescope.
+      local function git_drop_stash(prompt_bufnr)
+        -- Try getting all selections in telescope picker
+        local stashes = M.get_stash_selections(prompt_bufnr)
+        if stashes == false then
+          return
+        end
+        assert(type(stashes) == 'table', 'Telescope picker selection did not result in list!')
+
+        -- try dropping and close picker when done
+        M.git_drop_stash(stashes)
         actions.close(prompt_bufnr)
-        vim.schedule(git_stash_mappings)
       end
       map({ 'n', 'i' }, '<C-S-d>', git_drop_stash)
       return true

lua/kickstart/plugins/telescope.lua

@@ -197,7 +197,7 @@ return {
       vim.keymap.set('n', '<leader>gb', builtin.git_branches, { desc = '[G]it [B]ranches' })
       vim.keymap.set('n', '<leader>gc', builtin.git_commits, { desc = '[G]it [C]ommits' })
       vim.keymap.set('n', '<leader>gC', builtin.git_bcommits, { desc = '[G]it Buffer [C]ommits' })
-      vim.keymap.set('n', '<leader>gS', utils.git_stash_mappings, { desc = '[G]it [S]tash' })
+      vim.keymap.set('n', '<leader>gS', utils.git_stash, { desc = '[G]it [S]tash' })
     end,
   },
 }