refactor(bash): factorize __atuin_accept_line (#1476)

atuinsh · Jan 1, 2024 · c7db783 · c7db783 · vercel · Jan 1, 2024
1 parent 1350d3f
commit c7db783
Showing 1 changed file with 62 additions and 56 deletions.
diff --git a/atuin/src/shell/atuin.bash b/atuin/src/shell/atuin.bash
@@ -21,6 +21,67 @@ __atuin_set_ret_value() {
     return ${1:+"$1"}
 }
 
+__atuin_accept_line() {
+    local HISTORY=$1
+
+    # Reprint the prompt, accounting for multiple lines
+    local __atuin_prompt_offset
+    __atuin_prompt_offset=$(echo -n "${PS1@P}" | tr -cd '\n' | wc -c)
+    if ((__atuin_prompt_offset > 0)); then
+      tput cuu "$__atuin_prompt_offset"
+    fi
+    echo "${PS1@P}$HISTORY"
+
+    # Add it to the bash history
+    history -s "$HISTORY"
+
+    # Assuming bash-preexec
+    # Invoke every function in the preexec array
+    local preexec_function
+    local preexec_function_ret_value
+    local preexec_ret_value=0
+    for preexec_function in "${preexec_functions[@]:-}"; do
+      if type -t "$preexec_function" 1>/dev/null; then
+        __atuin_set_ret_value "${__bp_last_ret_value:-}"
+        "$preexec_function" "$HISTORY"
+        preexec_function_ret_value="$?"
+        if [[ "$preexec_function_ret_value" != 0 ]]; then
+          preexec_ret_value="$preexec_function_ret_value"
+        fi
+      fi
+    done
+
+    # If extdebug is turned on and any preexec function returns non-zero
+    # exit status, we do not run the user command.
+    if ! { shopt -q extdebug && ((preexec_ret_value)); }; then
+      # Juggle the terminal settings so that the command can be interacted with
+      local stty_backup
+      stty_backup=$(stty -g)
+      stty "$ATUIN_STTY"
+
+      # Execute the command.  Note: We need to record $? and $_ after the
+      # user command within the same call of "eval" because $_ is otherwise
+      # overwritten by the last argument of "eval".
+      __atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
+      eval -- "$HISTORY"$'\n__bp_last_ret_value=$? __bp_last_argument_prev_command=$_'
+
+      stty "$stty_backup"
+    fi
+
+    # Execute preprompt commands
+    local __atuin_prompt_command
+    for __atuin_prompt_command in "${PROMPT_COMMAND[@]}"; do
+      __atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
+      eval -- "$__atuin_prompt_command"
+    done
+    # Bash will redraw only the line with the prompt after we finish,
+    # so to work for a multiline prompt we need to print it ourselves,
+    # then move up a line
+    __atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
+    echo "${PS1@P}"
+    tput cuu 1
+}
+
 __atuin_history() {
     # shellcheck disable=SC2048,SC2086
     HISTORY="$(ATUIN_SHELL_BASH=t ATUIN_LOG=error atuin search $* -i -- "${READLINE_LINE}" 3>&1 1>&2 2>&3)"
@@ -33,62 +94,7 @@ __atuin_history() {
         ble-edit/content/reset-and-check-dirty "$HISTORY"
         ble/widget/accept-line
       else
-        # Reprint the prompt, accounting for multiple lines
-        local __atuin_prompt_offset
-        __atuin_prompt_offset=$(echo -n "${PS1@P}" | tr -cd '\n' | wc -c)
-        if ((__atuin_prompt_offset > 0)); then
-          tput cuu "$__atuin_prompt_offset"
-        fi
-        echo "${PS1@P}$HISTORY"
-
-        # Add it to the bash history
-        history -s "$HISTORY"
-
-        # Assuming bash-preexec
-        # Invoke every function in the preexec array
-        local preexec_function
-        local preexec_function_ret_value
-        local preexec_ret_value=0
-        for preexec_function in "${preexec_functions[@]:-}"; do
-          if type -t "$preexec_function" 1>/dev/null; then
-            __atuin_set_ret_value "${__bp_last_ret_value:-}"
-            "$preexec_function" "$HISTORY"
-            preexec_function_ret_value="$?"
-            if [[ "$preexec_function_ret_value" != 0 ]]; then
-              preexec_ret_value="$preexec_function_ret_value"
-            fi
-          fi
-        done
-
-        # If extdebug is turned on and any preexec function returns non-zero
-        # exit status, we do not run the user command.
-        if ! { shopt -q extdebug && ((preexec_ret_value)); }; then
-          # Juggle the terminal settings so that the command can be interacted with
-          local stty_backup
-          stty_backup=$(stty -g)
-          stty "$ATUIN_STTY"
-
-          # Execute the command.  Note: We need to record $? and $_ after the
-          # user command within the same call of "eval" because $_ is otherwise
-          # overwritten by the last argument of "eval".
-          __atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
-          eval -- "$HISTORY"$'\n__bp_last_ret_value=$? __bp_last_argument_prev_command=$_'
-
-          stty "$stty_backup"
-        fi
-
-        # Execute preprompt commands
-        local __atuin_prompt_command
-        for __atuin_prompt_command in "${PROMPT_COMMAND[@]}"; do
-          __atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
-          eval -- "$__atuin_prompt_command"
-        done
-        # Bash will redraw only the line with the prompt after we finish,
-        # so to work for a multiline prompt we need to print it ourselves,
-        # then move up a line
-        __atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
-        echo "${PS1@P}"
-        tput cuu 1
+        __atuin_accept_line "$HISTORY"
       fi
 
       READLINE_LINE=""