refactor(gstashapply): code reuse

Author: Bhavi Dhingra

cmd/gstashapply

@@ -2,27 +2,21 @@
 
 #shellcheck disable=SC1091 # Not following: ./__assertgitrepo was not specified as input
 #shellcheck disable=SC2155 # Declare and assign separately to avoid masking return values
-#shellcheck disable=SC2001 # See if you can use ${variable//search/replace}
 
 source "${__CUSTOM_GIT_UTIL}"/fzf_headers/__gstash_header
 source "${__CUSTOM_GIT_UTIL}"/__assertgitrepo
+source "${__CUSTOM_GIT_UTIL}"/__select_stash_id
 
 __assertgitrepo
 
 function main() {
 
-	local GSTASH_HEADER="$(__gstash_header)"
+	local GSTASH_HEADER="$(__gstash_header "apply")"
 
-	local selectedStr="$(git stash list | \
-							fzf --bind '?:toggle-preview'\
-								--header "${GSTASH_HEADER}"\
-								--preview "source ${__CUSTOM_GIT_UTIL}/fzf_previews/__gstash_preview; __gstash_preview {}")"
-	[ -z "${selectedStr}" ] && return
+	local stashId="$(__select_stash_id "${GSTASH_HEADER}")"
+	[ -z "${stashId}" ] && return
 
-	local stashId="$(echo "${selectedStr}" | sed 's/\:.*//g')"
 	git stash apply "${stashId}"
-
-	git status
 }
 
 main

util/__select_stash_id

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#shellcheck disable=SC2155 # Declare and assign separately to avoid masking return values
+#shellcheck disable=SC2001 # See if you can use ${variable//search/replace}
+
+# Usage: __select_stash_id "${HEADER}"
+function __select_stash_id() {
+
+	local GSTASH_HEADER="${1}"
+	local selectedStr="$(git stash list | \
+							fzf --bind '?:toggle-preview'\
+								--header "${GSTASH_HEADER}"\
+								--preview "source ${__CUSTOM_GIT_UTIL}/fzf_previews/__gstash_preview; __gstash_preview {}")"
+
+	echo "${selectedStr}" | sed 's/\:.*//g'
+}

util/fzf_headers/__gstash_header

@@ -8,11 +8,14 @@ source "$__CUSTOM_CONSOLE_UTIL"/__common
 
 function __gstash_header() {
 
-	local msg="gstashapply | enter: apply stash | ?: toggle preview"
-	local colorMsgL1="${UNDERLINE}${MAGENTA}gstashapply${RESET} | \
-${BLUE}enter:${RESET} apply stash | \
+	local op="${1}"
+	local cmd="gstash${1}"
+	local msg="${cmd} | enter: ${op} stash | ?: toggle preview"
+	local colorMsgL1="${UNDERLINE}${MAGENTA}gstash${op}${RESET} | \
+${BLUE}enter:${RESET} ${op} stash | \
 ${BLUE}?:${RESET} toggle preview"
-	local colorMsgL2="            | ${BLUE}esc:${RESET} quit"
+	local spaces="$(echo "${cmd}" | sed -e 's/./ /g')"
+	local colorMsgL2="${spaces} | ${BLUE}esc:${RESET} quit"
 
 	local edge="$(echo "${msg}" | sed -e 's/./-/g')"
 	local GSTASH_HEADER="${edge}"'