mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-09-19 21:17:31 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(shell): revise initialization scripts

Browse source
This commit is contained in:
L. Yeung 2024-07-26 16:28:38 +08:00 committed by Jan De Dobbeleer
parent 7081cac3a2
commit 7273dba124
4 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/shell/scripts/omp.bash
View file

@ -21,7 +21,7 @@ _omp_ftcs_marks=0
# start timer on command start
PS0='${_omp_start_time:0:$((_omp_start_time="$(_omp_start_timer)",0))}$(_omp_ftcs_command_start)'
# set secondary prompt
PS2="$(${_omp_executable} print secondary --shell=bash --shell-version="$BASH_VERSION")"
PS2="$("$_omp_executable" print secondary --shell=bash --shell-version="$BASH_VERSION")"
function _omp_set_cursor_position() {
# not supported in Midnight Commander
@ -37,18 +37,18 @@ function _omp_set_cursor_position() {
local ROW
IFS=';' read -sdR -p $'\E[6n' ROW COL
stty $oldstty
stty "$oldstty"
export POSH_CURSOR_LINE=${ROW#*[}
export POSH_CURSOR_COLUMN=${COL}
}
function _omp_start_timer() {
$_omp_executable get millis
"$_omp_executable" get millis
}
function _omp_ftcs_command_start() {
if [[ $_omp_ftcs_marks == 0 ]]; then
if [[ $_omp_ftcs_marks == 1 ]]; then
printf "\e]133;C\a"
fi
}
@ -62,31 +62,31 @@ function set_poshcontext() {
function _omp_hook() {
_omp_status_cache=$? _omp_pipestatus_cache=(${PIPESTATUS[@]})
if [[ "${#BP_PIPESTATUS[@]}" -ge "${#_omp_pipestatus_cache[@]}" ]]; then
if [[ ${#BP_PIPESTATUS[@]} -ge ${#_omp_pipestatus_cache[@]} ]]; then
_omp_pipestatus_cache=(${BP_PIPESTATUS[@]})
fi
_omp_stack_count=$((${#DIRSTACK[@]} - 1))
if [[ "$_omp_start_time" ]]; then
local omp_now=$(${_omp_executable} get millis --shell=bash)
if [[ $_omp_start_time ]]; then
local omp_now=$("$_omp_executable" get millis --shell=bash)
_omp_elapsed=$((omp_now - _omp_start_time))
_omp_start_time=""
_omp_no_exit_code="false"
fi
if [[ "${_omp_pipestatus_cache[-1]}" != "$_omp_status_cache" ]]; then
if [[ ${_omp_pipestatus_cache[-1]} != "$_omp_status_cache" ]]; then
_omp_pipestatus_cache=("$_omp_status_cache")
fi
set_poshcontext
_omp_set_cursor_position
PS1="$(${_omp_executable} print primary --shell=bash --shell-version="$BASH_VERSION" --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --no-status="$_omp_no_exit_code" --terminal-width="${COLUMNS-0}" | tr -d '\0')"
PS1="$("$_omp_executable" print primary --shell=bash --shell-version="$BASH_VERSION" --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --no-status="$_omp_no_exit_code" --terminal-width="${COLUMNS-0}" | tr -d '\0')"
return $_omp_status_cache
}
if [[ "$TERM" != "linux" ]] && [[ -x "$(command -v $_omp_executable)" ]] && ! [[ "$PROMPT_COMMAND" =~ "_omp_hook" ]]; then
if [[ $TERM != linux ]] && ! [[ $PROMPT_COMMAND =~ _omp_hook ]]; then
PROMPT_COMMAND="_omp_hook; $PROMPT_COMMAND"
fi

10
src/shell/scripts/omp.fish
View file

@ -1,8 +1,8 @@
set --global --export POSH_THEME ::CONFIG::
set --global --export POSH_SHELL_VERSION $FISH_VERSION
set --global --export POWERLINE_COMMAND oh-my-posh
set --global --export POSH_PID $fish_pid
set --global --export CONDA_PROMPT_MODIFIER false
set --export POSH_THEME ::CONFIG::
set --export POSH_SHELL_VERSION $FISH_VERSION
set --export POWERLINE_COMMAND oh-my-posh
set --export POSH_PID $fish_pid
set --export CONDA_PROMPT_MODIFIER false
set --global _omp_tooltip_command ''
set --global _omp_current_rprompt ''
set --global _omp_transient false

2
src/shell/scripts/omp.ps1
View file

@ -195,7 +195,6 @@ New-Module -Name "oh-my-posh-core" -ScriptBlock {
[Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$null, [ref]$null, [ref]$parseErrors, [ref]$null)
$executingCommand = $parseErrors.Count -eq 0
if ($executingCommand) {
$script:newPrompt = $true
$script:TooltipCommand = ''
Set-TransientPrompt
}
@ -215,7 +214,6 @@ New-Module -Name "oh-my-posh-core" -ScriptBlock {
[Microsoft.PowerShell.PSConsoleReadLine]::GetSelectionState([ref]$start, [ref]$null)
# only render a transient prompt when no text is selected
if ($start -eq -1) {
$script:newPrompt = $true
$script:TooltipCommand = ''
Set-TransientPrompt
}

26
src/shell/scripts/omp.zsh
View file

@ -13,7 +13,7 @@ _omp_cursor_positioning=0
_omp_ftcs_marks=0
# set secondary prompt
PS2="$(${_omp_executable} print secondary --shell=zsh)"
PS2="$($_omp_executable print secondary --shell=zsh)"
function _omp_set_cursor_position() {
# not supported in Midnight Commander
@ -47,7 +47,7 @@ function _omp_preexec() {
printf "\033]133;C\007"
fi
_omp_start_time=$(${_omp_executable} get millis)
_omp_start_time=$($_omp_executable get millis)
}
function _omp_precmd() {
@ -58,12 +58,12 @@ function _omp_precmd() {
_omp_no_exit_code="true"
if [ $_omp_start_time ]; then
local omp_now=$(${_omp_executable} get millis --shell=zsh)
local omp_now=$($_omp_executable get millis --shell=zsh)
_omp_elapsed=$(($omp_now - $_omp_start_time))
_omp_no_exit_code="false"
fi
if [[ "${_omp_pipestatus_cache[-1]}" != "$_omp_status_cache" ]]; then
if [[ ${_omp_pipestatus_cache[-1]} != "$_omp_status_cache" ]]; then
_omp_pipestatus_cache=("$_omp_status_cache")
fi
@ -73,7 +73,7 @@ function _omp_precmd() {
set_poshcontext
_omp_set_cursor_position
eval "$(${_omp_executable} print primary --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --eval --shell=zsh --shell-version="$ZSH_VERSION" --no-status="$_omp_no_exit_code")"
eval "$($_omp_executable print primary --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --eval --shell=zsh --shell-version="$ZSH_VERSION" --no-status="$_omp_no_exit_code")"
unset _omp_start_time
}
@ -90,10 +90,10 @@ function _omp_cleanup() {
)
local widget
for widget in "${omp_widgets[@]}"; do
if [[ "${widgets[_omp_original::$widget]}" ]]; then
if [[ ${widgets[_omp_original::$widget]} ]]; then
# Restore the original widget.
zle -A _omp_original::$widget $widget
elif [[ "${widgets[$widget]}" = user:_omp_* ]]; then
elif [[ ${widgets[$widget]} = user:_omp_* ]]; then
# Delete the OMP-defined widget.
zle -D $widget
fi
@ -103,7 +103,7 @@ _omp_cleanup
unset -f _omp_cleanup
function _omp_render_tooltip() {
if [[ "$KEYS" != ' ' ]]; then
if [[ $KEYS != ' ' ]]; then
return
fi
@ -111,13 +111,13 @@ function _omp_render_tooltip() {
local tooltip_command=${${(MS)BUFFER##[[:graph:]]*}%%[[:space:]]*}
# Ignore an empty/repeated tooltip command.
if [[ -z "$tooltip_command" ]] || [[ "$tooltip_command" = "$_omp_tooltip_command" ]]; then
if [[ -z $tooltip_command ]] || [[ $tooltip_command = "$_omp_tooltip_command" ]]; then
return
fi
_omp_tooltip_command="$tooltip_command"
local tooltip=$(${_omp_executable} print tooltip --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --command="$tooltip_command" --shell=zsh --shell-version="$ZSH_VERSION" --no-status="$_omp_no_exit_code")
if [[ -z "$tooltip" ]]; then
local tooltip=$($_omp_executable print tooltip --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --command="$tooltip_command" --shell=zsh --shell-version="$ZSH_VERSION" --no-status="$_omp_no_exit_code")
if [[ -z $tooltip ]]; then
return
fi
@ -135,7 +135,7 @@ function _omp_zle-line-init() {
(( $+zle_bracketed_paste )) && print -r -n - $zle_bracketed_paste[2]
_omp_tooltip_command=''
eval "$(${_omp_executable} print transient --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --eval --shell=zsh --shell-version="$ZSH_VERSION" --no-status="$_omp_no_exit_code")"
eval "$($_omp_executable print transient --status="$_omp_status_cache" --pipestatus="${_omp_pipestatus_cache[*]}" --execution-time="$_omp_elapsed" --stack-count="$_omp_stack_count" --eval --shell=zsh --shell-version="$ZSH_VERSION" --no-status="$_omp_no_exit_code")"
zle .reset-prompt
# Exit the shell if we receive EOT.
@ -191,7 +191,7 @@ function _omp_create_widget() {
}
function enable_poshtooltips() {
widget=${$(bindkey " "):2}
local widget=${$(bindkey " "):2}
if [[ -z $widget ]]; then
widget=self-insert