Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop passing arguments to prompt_* functions; rename some internal functions

Browse Source
pull/145/head
romkatv 6 years ago
parent 82698c179b
commit 043ae21090
1 changed files with 213 additions and 210 deletions
Show Stats Download Patch File Download Diff File

297
internal/p10k.zsh
Unescape Escape View File

@ -204,7 +204,7 @@ function _p9k_human_readable_bytes() {
# Pass the name of the segment to this function to test for its presence in # Pass the name of the segment to this function to test for its presence in
# either the LEFT or RIGHT prompt arrays. # either the LEFT or RIGHT prompt arrays.
# * $1: The segment to be tested. # * $1: The segment to be tested.
segment_in_use() { _p9k_segment_in_use() {
(( $_POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[(I)$1(|_joined)] || (( $_POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[(I)$1(|_joined)] ||
$_POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[(I)$1(|_joined)] )) $_POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[(I)$1(|_joined)] ))
} }
@ -408,22 +408,21 @@ _p9k_escape() {
# * $1: Name of the function that was originally invoked. # * $1: Name of the function that was originally invoked.
# Necessary, to make the dynamic color-overwrite mechanism work. # Necessary, to make the dynamic color-overwrite mechanism work.
# * $2: The array index of the current segment. # * $2: Background color.
# * $3: Background color. # * $3: Foreground color.
# * $4: Foreground color. # * $4: An identifying icon.
# * $5: An identifying icon. # * $5: 1 to to perform parameter expansion and process substitution.
# * $6: 1 to to perform parameter expansion and process substitution. # * $6: If not empty but becomes empty after parameter expansion and process substitution,
# * $7: If not empty but becomes empty after parameter expansion and process substitution,
# the segment isn't rendered. # the segment isn't rendered.
# * $8: Content. # * $7: Content.
left_prompt_segment() { _p9k_left_prompt_segment() {
if ! _p9k_cache_get "$0" "$1" "$2" "$3" "$4" "$5"; then if ! _p9k_cache_get "$0" "$1" "$2" "$3" "$4" "$_p9k_segment_index"; then
_p9k_color $1 BACKGROUND $3 _p9k_color $1 BACKGROUND $2
local bg_color=$_p9k_ret local bg_color=$_p9k_ret
_p9k_background $bg_color _p9k_background $bg_color
local bg=$_p9k_ret local bg=$_p9k_ret
_p9k_color $1 FOREGROUND $4 _p9k_color $1 FOREGROUND $3
local fg_color=$_p9k_ret local fg_color=$_p9k_ret
_p9k_foreground $fg_color _p9k_foreground $fg_color
local fg=$_p9k_ret local fg=$_p9k_ret
@ -438,8 +437,8 @@ left_prompt_segment() {
local subsep_=$_p9k_ret local subsep_=$_p9k_ret
local icon_ local icon_
if [[ -n $5 ]]; then if [[ -n $4 ]]; then
_p9k_get_icon $1 $5 _p9k_get_icon $1 $4
_p9k_escape $_p9k_ret _p9k_escape $_p9k_ret
icon_=$_p9k_ret icon_=$_p9k_ret
fi fi
@ -497,9 +496,9 @@ left_prompt_segment() {
fi fi
_p9k_t+=%b$bg$s$style$left_space # 4 _p9k_t+=%b$bg$s$style$left_space # 4
local join="_p9k_i>=$_p9k_left_join[$2]" local join="_p9k_i>=$_p9k_left_join[$_p9k_segment_index]"
_p9k_param $1 SELF_JOINED false _p9k_param $1 SELF_JOINED false
[[ $_p9k_ret == false ]] && join+="&&_p9k_i<$2" [[ $_p9k_ret == false ]] && join+="&&_p9k_i<$_p9k_segment_index"
local p= local p=
p+="\${_p9k_n::=}" p+="\${_p9k_n::=}"
@ -607,7 +606,7 @@ left_prompt_segment() {
p+='${${:-' p+='${${:-'
p+="\${_p9k_s::=%F{$bg_color\}$sep_}\${_p9k_ss::=$subsep_}\${_p9k_sss::=%F{$bg_color\}$end_sep_}" p+="\${_p9k_s::=%F{$bg_color\}$sep_}\${_p9k_ss::=$subsep_}\${_p9k_sss::=%F{$bg_color\}$end_sep_}"
p+="\${_p9k_i::=$2}\${_p9k_bg::=$bg_color}" p+="\${_p9k_i::=$_p9k_segment_index}\${_p9k_bg::=$bg_color}"
p+='}+}' p+='}+}'
p+='}' p+='}'
@ -615,25 +614,25 @@ left_prompt_segment() {
_p9k_cache_set "$p" _p9k_cache_set "$p"
fi fi
(( $6 )) && _p9k_ret=$8 || _p9k_escape $8 (( $5 )) && _p9k_ret=$7 || _p9k_escape $7
if [[ -z $7 ]]; then if [[ -z $6 ]]; then
_p9k_prompt+="\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]" _p9k_prompt+="\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]"
else else
_p9k_prompt+="\${\${:-$7}:+\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]}" _p9k_prompt+="\${\${:-$6}:+\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]}"
fi fi
} }
# The same as left_prompt_segment above but for the right prompt. # The same as _p9k_left_prompt_segment above but for the right prompt.
right_prompt_segment() { _p9k_right_prompt_segment() {
if ! _p9k_cache_get "$0" "$1" "$2" "$3" "$4" "$5"; then if ! _p9k_cache_get "$0" "$1" "$2" "$3" "$4" "$_p9k_segment_index"; then
_p9k_color $1 BACKGROUND $3 _p9k_color $1 BACKGROUND $2
local bg_color=$_p9k_ret local bg_color=$_p9k_ret
_p9k_background $bg_color _p9k_background $bg_color
local bg=$_p9k_ret local bg=$_p9k_ret
_p9k_escape_rcurly $_p9k_ret _p9k_escape_rcurly $_p9k_ret
local bg_=$_p9k_ret local bg_=$_p9k_ret
_p9k_color $1 FOREGROUND $4 _p9k_color $1 FOREGROUND $3
local fg_color=$_p9k_ret local fg_color=$_p9k_ret
_p9k_foreground $fg_color _p9k_foreground $fg_color
local fg=$_p9k_ret local fg=$_p9k_ret
@ -647,8 +646,8 @@ right_prompt_segment() {
local subsep=$_p9k_ret local subsep=$_p9k_ret
local icon_ local icon_
if [[ -n $5 ]]; then if [[ -n $4 ]]; then
_p9k_get_icon $1 $5 _p9k_get_icon $1 $4
_p9k_escape $_p9k_ret _p9k_escape $_p9k_ret
icon_=$_p9k_ret icon_=$_p9k_ret
fi fi
@ -697,9 +696,9 @@ right_prompt_segment() {
_p9k_t+=$w$subsep$style$left_space # 3 _p9k_t+=$w$subsep$style$left_space # 3
_p9k_t+=$w%F{$bg_color}$sep$style$left_space # 4 _p9k_t+=$w%F{$bg_color}$sep$style$left_space # 4
local join="_p9k_i>=$_p9k_right_join[$2]" local join="_p9k_i>=$_p9k_right_join[$_p9k_segment_index]"
_p9k_param $1 SELF_JOINED false _p9k_param $1 SELF_JOINED false
[[ $_p9k_ret == false ]] && join+="&&_p9k_i<$2" [[ $_p9k_ret == false ]] && join+="&&_p9k_i<$_p9k_segment_index"
local p= local p=
p+="\${_p9k_n::=}" p+="\${_p9k_n::=}"
@ -824,7 +823,7 @@ right_prompt_segment() {
[[ $end_sep_ == *%* ]] && p+=$style_ [[ $end_sep_ == *%* ]] && p+=$style_
p+='}' p+='}'
p+="\${_p9k_i::=$2}\${_p9k_bg::=$bg_color}" p+="\${_p9k_i::=$_p9k_segment_index}\${_p9k_bg::=$bg_color}"
p+='}+}' p+='}+}'
p+='}' p+='}'
@ -832,14 +831,16 @@ right_prompt_segment() {
_p9k_cache_set "$p" _p9k_cache_set "$p"
fi fi
(( $6 )) && _p9k_ret=$8 || _p9k_escape $8 (( $5 )) && _p9k_ret=$7 || _p9k_escape $7
if [[ -z $7 ]]; then if [[ -z $6 ]]; then
_p9k_prompt+="\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]" _p9k_prompt+="\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]"
else else
_p9k_prompt+="\${\${:-$7}:+\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]}" _p9k_prompt+="\${\${:-$6}:+\${\${:-\${P9K_CONTENT::=$_p9k_ret}$_p9k_cache_val[1]}"
fi fi
} }
function _p9k_prompt_segment() { "_p9k_${_p9k_prompt_side}_prompt_segment" "$@" }
function p9k_prompt_segment() { function p9k_prompt_segment() {
emulate -L zsh && setopt no_hist_expand extended_glob emulate -L zsh && setopt no_hist_expand extended_glob
local opt state bg fg icon cond text sym=0 expand=0 local opt state bg fg icon cond text sym=0 expand=0
@ -864,8 +865,8 @@ function p9k_prompt_segment() {
return 1 return 1
} }
(( sym )) || icon=$'\1'$icon (( sym )) || icon=$'\1'$icon
"${_p9k_prompt_side}_prompt_segment" "prompt_${_p9k_segment_name}${state:+_${(U)state}}" \ "_p9k_${_p9k_prompt_side}_prompt_segment" "prompt_${_p9k_segment_name}${state:+_${(U)state}}" \
"${_p9k_segment_index}" "$bg" "${fg:-$_p9k_color1}" "$icon" "$expand" "$cond" "$text" "$bg" "${fg:-$_p9k_color1}" "$icon" "$expand" "$cond" "$text"
return 0 return 0
} }
@ -888,7 +889,7 @@ prompt_anaconda() {
msg="$_p9k_ret " msg="$_p9k_ret "
fi fi
msg+="$_POWERLEVEL9K_ANACONDA_LEFT_DELIMITER${${p:t}//\%/%%}$_POWERLEVEL9K_ANACONDA_RIGHT_DELIMITER" msg+="$_POWERLEVEL9K_ANACONDA_LEFT_DELIMITER${${p:t}//\%/%%}$_POWERLEVEL9K_ANACONDA_RIGHT_DELIMITER"
"$1_prompt_segment" "$0" "$2" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg" _p9k_prompt_segment "$0" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg"
} }
################################################################ ################################################################
@ -896,7 +897,7 @@ prompt_anaconda() {
prompt_aws() { prompt_aws() {
local aws_profile="${AWS_PROFILE:-$AWS_DEFAULT_PROFILE}" local aws_profile="${AWS_PROFILE:-$AWS_DEFAULT_PROFILE}"
if [[ -n "$aws_profile" ]]; then if [[ -n "$aws_profile" ]]; then
"$1_prompt_segment" "$0" "$2" red white 'AWS_ICON' 0 '' "${aws_profile//\%/%%}" _p9k_prompt_segment "$0" red white 'AWS_ICON' 0 '' "${aws_profile//\%/%%}"
fi fi
} }
@ -905,7 +906,7 @@ prompt_aws() {
prompt_aws_eb_env() { prompt_aws_eb_env() {
[[ -r .elasticbeanstalk/config.yml ]] || return [[ -r .elasticbeanstalk/config.yml ]] || return
local v=${=$(grep environment .elasticbeanstalk/config.yml 2>/dev/null)[2]} local v=${=$(grep environment .elasticbeanstalk/config.yml 2>/dev/null)[2]}
[[ -n $v ]] && "$1_prompt_segment" "$0" "$2" black green 'AWS_EB_ICON' 0 '' "${v//\%/%%}" [[ -n $v ]] && _p9k_prompt_segment "$0" black green 'AWS_EB_ICON' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
@ -919,7 +920,7 @@ prompt_background_jobs() {
msg='${${(%):-%j}:#1}' msg='${${(%):-%j}:#1}'
fi fi
fi fi
$1_prompt_segment $0 $2 "$_p9k_color1" cyan BACKGROUND_JOBS_ICON 1 '${${(%):-%j}:#0}' "$msg" _p9k_prompt_segment $0 "$_p9k_color1" cyan BACKGROUND_JOBS_ICON 1 '${${(%):-%j}:#0}' "$msg"
} }
################################################################ ################################################################
@ -942,7 +943,7 @@ prompt_disk_usage() {
bg=$_p9k_color1 bg=$_p9k_color1
fg=yellow fg=yellow
fi fi
$1_prompt_segment $0_$state $2 $bg $fg DISK_ICON 0 '' "$disk_usage%%" _p9k_prompt_segment $0_$state $bg $fg DISK_ICON 0 '' "$disk_usage%%"
} }
function _p9k_read_file() { function _p9k_read_file() {
@ -1056,7 +1057,7 @@ prompt_battery() {
bg=$_POWERLEVEL9K_BATTERY_LEVEL_BACKGROUND[idx] bg=$_POWERLEVEL9K_BATTERY_LEVEL_BACKGROUND[idx]
fi fi
$1_prompt_segment $0_$state $2 "$bg" "$_p9k_battery_states[$state]" $icon 0 '' $msg _p9k_prompt_segment $0_$state "$bg" "$_p9k_battery_states[$state]" $icon 0 '' $msg
} }
################################################################ ################################################################
@ -1068,7 +1069,7 @@ prompt_public_ip() {
fi fi
local ip='${_p9k_public_ip:-$_POWERLEVEL9K_PUBLIC_IP_NONE}' local ip='${_p9k_public_ip:-$_POWERLEVEL9K_PUBLIC_IP_NONE}'
$1_prompt_segment "$0" "$2" "$_p9k_color1" "$_p9k_color2" "$icon" 1 $ip $ip _p9k_prompt_segment "$0" "$_p9k_color1" "$_p9k_color2" "$icon" 1 $ip $ip
} }
################################################################ ################################################################
@ -1109,7 +1110,7 @@ prompt_context() {
fi fi
(( _p9k_cache_val[1] )) || return (( _p9k_cache_val[1] )) || return
"$1_prompt_segment" "$0_$_p9k_cache_val[2]" "$2" "$_p9k_color1" yellow '' 0 '' "$_p9k_cache_val[3]" _p9k_prompt_segment "$0_$_p9k_cache_val[2]" "$_p9k_color1" yellow '' 0 '' "$_p9k_cache_val[3]"
} }
################################################################ ################################################################
@ -1120,11 +1121,11 @@ prompt_user() {
if [[ $_POWERLEVEL9K_ALWAYS_SHOW_USER == 0 && $user == $DEFAULT_USER ]]; then if [[ $_POWERLEVEL9K_ALWAYS_SHOW_USER == 0 && $user == $DEFAULT_USER ]]; then
_p9k_cache_set true _p9k_cache_set true
elif [[ "${(%):-%#}" == '#' ]]; then elif [[ "${(%):-%#}" == '#' ]]; then
_p9k_cache_set "$1_prompt_segment" "${0}_ROOT" "$2" "${_p9k_color1}" yellow ROOT_ICON 0 '' "$_POWERLEVEL9K_USER_TEMPLATE" _p9k_cache_set _p9k_prompt_segment "${0}_ROOT" "${_p9k_color1}" yellow ROOT_ICON 0 '' "$_POWERLEVEL9K_USER_TEMPLATE"
elif [[ -n "$SUDO_COMMAND" ]]; then elif [[ -n "$SUDO_COMMAND" ]]; then
_p9k_cache_set "$1_prompt_segment" "${0}_SUDO" "$2" "${_p9k_color1}" yellow SUDO_ICON 0 '' "$_POWERLEVEL9K_USER_TEMPLATE" _p9k_cache_set _p9k_prompt_segment "${0}_SUDO" "${_p9k_color1}" yellow SUDO_ICON 0 '' "$_POWERLEVEL9K_USER_TEMPLATE"
else else
_p9k_cache_set "$1_prompt_segment" "${0}_DEFAULT" "$2" "${_p9k_color1}" yellow USER_ICON 0 '' "${user//\%/%%}" _p9k_cache_set _p9k_prompt_segment "${0}_DEFAULT" "${_p9k_color1}" yellow USER_ICON 0 '' "${user//\%/%%}"
fi fi
fi fi
"$_p9k_cache_val[@]" "$_p9k_cache_val[@]"
@ -1134,23 +1135,23 @@ prompt_user() {
# Host: machine (where am I) # Host: machine (where am I)
prompt_host() { prompt_host() {
if (( _P9K_SSH )); then if (( _P9K_SSH )); then
"$1_prompt_segment" "$0_REMOTE" "$2" "${_p9k_color1}" yellow SSH_ICON 0 '' "$_POWERLEVEL9K_HOST_TEMPLATE" _p9k_prompt_segment "$0_REMOTE" "${_p9k_color1}" yellow SSH_ICON 0 '' "$_POWERLEVEL9K_HOST_TEMPLATE"
else else
"$1_prompt_segment" "$0_LOCAL" "$2" "${_p9k_color1}" yellow HOST_ICON 0 '' "$_POWERLEVEL9K_HOST_TEMPLATE" _p9k_prompt_segment "$0_LOCAL" "${_p9k_color1}" yellow HOST_ICON 0 '' "$_POWERLEVEL9K_HOST_TEMPLATE"
fi fi
} }
################################################################ ################################################################
# The 'custom` prompt provides a way for users to invoke commands and display # The 'custom` prompt provides a way for users to invoke commands and display
# the output in a segment. # the output in a segment.
prompt_custom() { _p9k_custom_prompt() {
local segment_name=${3:u} local segment_name=${1:u}
local command=POWERLEVEL9K_CUSTOM_${segment_name} local command=POWERLEVEL9K_CUSTOM_${segment_name}
local -a cmd=("${(@Q)${(z)${(P)command}}}") local -a cmd=("${(@Q)${(z)${(P)command}}}")
whence $cmd[1] &>/dev/null || return whence $cmd[1] &>/dev/null || return
local content=$("$cmd[@]") local content=$("$cmd[@]")
[[ -n $content ]] || return [[ -n $content ]] || return
"$1_prompt_segment" "${0}_${3:u}" "$2" $_p9k_color2 $_p9k_color1 "CUSTOM_${segment_name}_ICON" 0 '' "$content" _p9k_prompt_segment "prompt_custom_$segment_name" $_p9k_color2 $_p9k_color1 "CUSTOM_${segment_name}_ICON" 0 '' "$content"
} }
################################################################ ################################################################
@ -1193,7 +1194,7 @@ prompt_command_execution_time() {
fi fi
fi fi
"$1_prompt_segment" "$0" "$2" "red" "yellow1" 'EXECUTION_TIME_ICON' 0 '' $text _p9k_prompt_segment "$0" "red" "yellow1" 'EXECUTION_TIME_ICON' 0 '' $text
} }
function _p9k_shorten_delim_len() { function _p9k_shorten_delim_len() {
@ -1514,14 +1515,14 @@ prompt_dir() {
_p9k_cache_val[4]='%{d%\}'$_p9k_cache_val[4]'%{d%\}' _p9k_cache_val[4]='%{d%\}'$_p9k_cache_val[4]'%{d%\}'
fi fi
fi fi
$1_prompt_segment "$_p9k_cache_val[1]" "$2" "blue" "$_p9k_color1" "$_p9k_cache_val[2]" "$_p9k_cache_val[3]" "" "$_p9k_cache_val[4]" _p9k_prompt_segment "$_p9k_cache_val[1]" "blue" "$_p9k_color1" "$_p9k_cache_val[2]" "$_p9k_cache_val[3]" "" "$_p9k_cache_val[4]"
} }
################################################################ ################################################################
# Docker machine # Docker machine
prompt_docker_machine() { prompt_docker_machine() {
if [[ -n "$DOCKER_MACHINE_NAME" ]]; then if [[ -n "$DOCKER_MACHINE_NAME" ]]; then
"$1_prompt_segment" "$0" "$2" "magenta" "$_p9k_color1" 'SERVER_ICON' 0 '' "${DOCKER_MACHINE_NAME//\%/%%}" _p9k_prompt_segment "$0" "magenta" "$_p9k_color1" 'SERVER_ICON' 0 '' "${DOCKER_MACHINE_NAME//\%/%%}"
fi fi
} }
@ -1547,13 +1548,13 @@ prompt_go_version() {
dir=${dir:h} dir=${dir:h}
done done
fi fi
"$1_prompt_segment" "$0" "$2" "green" "grey93" "GO_ICON" 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "green" "grey93" "GO_ICON" 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
# Command number (in local history) # Command number (in local history)
prompt_history() { prompt_history() {
"$1_prompt_segment" "$0" "$2" "grey50" "$_p9k_color1" '' 0 '' '%h' _p9k_prompt_segment "$0" "grey50" "$_p9k_color1" '' 0 '' '%h'
} }
################################################################ ################################################################
@ -1565,7 +1566,7 @@ prompt_detect_virt() {
[[ "$(ls -di /)" != "2 /" ]] && virt="chroot" [[ "$(ls -di /)" != "2 /" ]] && virt="chroot"
fi fi
if [[ -n "${virt}" ]]; then if [[ -n "${virt}" ]]; then
"$1_prompt_segment" "$0" "$2" "$_p9k_color1" "yellow" '' 0 '' "${virt//\%/%%}" _p9k_prompt_segment "$0" "$_p9k_color1" "yellow" '' 0 '' "${virt//\%/%%}"
fi fi
} }
@ -1573,14 +1574,14 @@ prompt_detect_virt() {
# Segment to display the current IP address # Segment to display the current IP address
prompt_ip() { prompt_ip() {
_p9k_parse_ip $_POWERLEVEL9K_IP_INTERFACE || return _p9k_parse_ip $_POWERLEVEL9K_IP_INTERFACE || return
"$1_prompt_segment" "$0" "$2" "cyan" "$_p9k_color1" 'NETWORK_ICON' 0 '' "${_p9k_ret//\%/%%}" _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" 'NETWORK_ICON' 0 '' "${_p9k_ret//\%/%%}"
} }
################################################################ ################################################################
# Segment to display if VPN is active # Segment to display if VPN is active
prompt_vpn_ip() { prompt_vpn_ip() {
_p9k_parse_ip $_POWERLEVEL9K_VPN_IP_INTERFACE || return _p9k_parse_ip $_POWERLEVEL9K_VPN_IP_INTERFACE || return
"$1_prompt_segment" "$0" "$2" "cyan" "$_p9k_color1" 'VPN_ICON' 0 '' "${_p9k_ret//\%/%%}" _p9k_prompt_segment "$0" "cyan" "$_p9k_color1" 'VPN_ICON' 0 '' "${_p9k_ret//\%/%%}"
} }
################################################################ ################################################################
@ -1590,7 +1591,7 @@ prompt_laravel_version() {
if [[ -n "${laravel_version}" && "${laravel_version}" =~ "Laravel Framework" ]]; then if [[ -n "${laravel_version}" && "${laravel_version}" =~ "Laravel Framework" ]]; then
# Strip out everything but the version # Strip out everything but the version
laravel_version="${laravel_version//Laravel Framework /}" laravel_version="${laravel_version//Laravel Framework /}"
"$1_prompt_segment" "$0" "$2" "maroon" "white" 'LARAVEL_ICON' 0 '' "${laravel_version//\%/%%}" _p9k_prompt_segment "$0" "maroon" "white" 'LARAVEL_ICON' 0 '' "${laravel_version//\%/%%}"
fi fi
} }
@ -1628,7 +1629,7 @@ prompt_load() {
local state=normal bg=green local state=normal bg=green
fi fi
$1_prompt_segment $0_$state $2 $bg "$_p9k_color1" LOAD_ICON 0 '' $load _p9k_prompt_segment $0_$state $bg "$_p9k_color1" LOAD_ICON 0 '' $load
} }
function _p9k_cached_cmd_stdout() { function _p9k_cached_cmd_stdout() {
@ -1676,7 +1677,7 @@ prompt_node_version() {
fi fi
_p9k_cached_cmd_stdout node --version && [[ $_p9k_ret == v?* ]] || return _p9k_cached_cmd_stdout node --version && [[ $_p9k_ret == v?* ]] || return
"$1_prompt_segment" "$0" "$2" "green" "white" 'NODE_ICON' 0 '' "${_p9k_ret#v}" _p9k_prompt_segment "$0" "green" "white" 'NODE_ICON' 0 '' "${_p9k_ret#v}"
} }
# Almost the same as `nvm_version default` but faster. The differences shouldn't affect # Almost the same as `nvm_version default` but faster. The differences shouldn't affect
@ -1780,7 +1781,7 @@ prompt_nvm() {
[[ -n $NVM_DIR ]] && _p9k_nvm_ls_current || return [[ -n $NVM_DIR ]] && _p9k_nvm_ls_current || return
local current=$_p9k_ret local current=$_p9k_ret
! _p9k_nvm_ls_default || [[ $_p9k_ret != $current ]] || return ! _p9k_nvm_ls_default || [[ $_p9k_ret != $current ]] || return
$1_prompt_segment "$0" "$2" "magenta" "black" 'NODE_ICON' 0 '' "${${current#v}//\%/%%}" _p9k_prompt_segment "$0" "magenta" "black" 'NODE_ICON' 0 '' "${${current#v}//\%/%%}"
} }
################################################################ ################################################################
@ -1789,7 +1790,7 @@ prompt_nodeenv() {
if [[ -n "$NODE_VIRTUAL_ENV" ]]; then if [[ -n "$NODE_VIRTUAL_ENV" ]]; then
_p9k_cached_cmd_stdout node --version || return _p9k_cached_cmd_stdout node --version || return
local info="${_p9k_ret}[${NODE_VIRTUAL_ENV:t}]" local info="${_p9k_ret}[${NODE_VIRTUAL_ENV:t}]"
"$1_prompt_segment" "$0" "$2" "black" "green" 'NODE_ICON' 0 '' "${info//\%/%%}" _p9k_prompt_segment "$0" "black" "green" 'NODE_ICON' 0 '' "${info//\%/%%}"
fi fi
} }
@ -1841,13 +1842,13 @@ prompt_nodenv() {
_p9k_nodeenv_version_transform $_p9k_ret && [[ $v == $_p9k_ret ]] && return _p9k_nodeenv_version_transform $_p9k_ret && [[ $v == $_p9k_ret ]] && return
fi fi
"$1_prompt_segment" "$0" "$2" "black" "green" 'NODE_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "black" "green" 'NODE_ICON' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
# Segment to print a little OS icon # Segment to print a little OS icon
prompt_os_icon() { prompt_os_icon() {
"$1_prompt_segment" "$0" "$2" "black" "white" '' 0 '' "$_p9k_os_icon" _p9k_prompt_segment "$0" "black" "white" '' 0 '' "$_p9k_os_icon"
} }
################################################################ ################################################################
@ -1857,7 +1858,7 @@ prompt_php_version() {
local -a match local -a match
[[ $_p9k_ret == (#b)(*$'\n')#(PHP [[:digit:].]##)* ]] || return [[ $_p9k_ret == (#b)(*$'\n')#(PHP [[:digit:].]##)* ]] || return
local v=$match[2] local v=$match[2]
"$1_prompt_segment" "$0" "$2" "fuchsia" "grey93" '' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "fuchsia" "grey93" '' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
@ -1886,7 +1887,7 @@ prompt_ram() {
esac esac
_p9k_human_readable_bytes $free_bytes _p9k_human_readable_bytes $free_bytes
$1_prompt_segment $0 $2 yellow "$_p9k_color1" RAM_ICON 0 '' $_p9k_ret _p9k_prompt_segment $0 yellow "$_p9k_color1" RAM_ICON 0 '' $_p9k_ret
} }
function _p9k_read_rbenv_version_file() { function _p9k_read_rbenv_version_file() {
@ -1929,7 +1930,7 @@ prompt_rbenv() {
[[ $v == $_p9k_ret ]] && return [[ $v == $_p9k_ret ]] && return
fi fi
"$1_prompt_segment" "$0" "$2" "red" "$_p9k_color1" 'RUBY_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "red" "$_p9k_color1" 'RUBY_ICON' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
@ -1940,13 +1941,13 @@ prompt_chruby() {
local v='' local v=''
(( _POWERLEVEL9K_CHRUBY_SHOW_ENGINE )) && v=$RUBY_ENGINE (( _POWERLEVEL9K_CHRUBY_SHOW_ENGINE )) && v=$RUBY_ENGINE
if [[ $_POWERLEVEL9K_CHRUBY_SHOW_VERSION == 1 && -n $RUBY_VERSION ]] && v+=${v:+ }$RUBY_VERSION if [[ $_POWERLEVEL9K_CHRUBY_SHOW_VERSION == 1 && -n $RUBY_VERSION ]] && v+=${v:+ }$RUBY_VERSION
"$1_prompt_segment" "$0" "$2" "red" "$_p9k_color1" 'RUBY_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "red" "$_p9k_color1" 'RUBY_ICON' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
# Segment to print an icon if user is root. # Segment to print an icon if user is root.
prompt_root_indicator() { prompt_root_indicator() {
"$1_prompt_segment" "$0" "$2" "$_p9k_color1" "yellow" 'ROOT_ICON' 0 '${${(%):-%#}:#%}' '' _p9k_prompt_segment "$0" "$_p9k_color1" "yellow" 'ROOT_ICON' 0 '${${(%):-%#}:#%}' ''
} }
################################################################ ################################################################
@ -1955,7 +1956,7 @@ prompt_rust_version() {
_p9k_cached_cmd_stdout rustc --version || return _p9k_cached_cmd_stdout rustc --version || return
local v=${${_p9k_ret#rustc }%% *} local v=${${_p9k_ret#rustc }%% *}
[[ -n $v ]] || return [[ -n $v ]] || return
"$1_prompt_segment" "$0" "$2" "darkorange" "$_p9k_color1" 'RUST_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "darkorange" "$_p9k_color1" 'RUST_ICON' 0 '' "${v//\%/%%}"
} }
# RSpec test ratio # RSpec test ratio
@ -1964,7 +1965,7 @@ prompt_rspec_stats() {
local -a code=(app/**/*.rb(N)) local -a code=(app/**/*.rb(N))
(( $#code )) || return (( $#code )) || return
local tests=(spec/**/*.rb(N)) local tests=(spec/**/*.rb(N))
build_test_stats "$1" "$0" "$2" "$#code" "$#tests" "RSpec" 'TEST_ICON' _p9k_build_test_stats "$0" "$#code" "$#tests" "RSpec" 'TEST_ICON'
fi fi
} }
@ -1975,18 +1976,18 @@ prompt_rvm() {
[[ $GEM_HOME == *rvm* && $ruby_string != $rvm_path/bin/ruby ]] || return [[ $GEM_HOME == *rvm* && $ruby_string != $rvm_path/bin/ruby ]] || return
local v=${${${GEM_HOME:t}%%${rvm_gemset_separator:-@}*}#*-} local v=${${${GEM_HOME:t}%%${rvm_gemset_separator:-@}*}#*-}
[[ -n $v ]] || return [[ -n $v ]] || return
"$1_prompt_segment" "$0" "$2" "240" "$_p9k_color1" 'RUBY_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "240" "$_p9k_color1" 'RUBY_ICON' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
# Segment to display SSH icon when connected # Segment to display SSH icon when connected
prompt_ssh() { prompt_ssh() {
if [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then if [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
"$1_prompt_segment" "$0" "$2" "$_p9k_color1" "yellow" 'SSH_ICON' 0 '' '' _p9k_prompt_segment "$0" "$_p9k_color1" "yellow" 'SSH_ICON' 0 '' ''
fi fi
} }
exit_code_or_status() { _p9k_exit_code_or_status() {
local ec=$1 local ec=$1
if (( _POWERLEVEL9K_STATUS_HIDE_SIGNAME || ec <= 128 )); then if (( _POWERLEVEL9K_STATUS_HIDE_SIGNAME || ec <= 128 )); then
_p9k_ret=$ec _p9k_ret=$ec
@ -2007,34 +2008,34 @@ prompt_status() {
if (( _POWERLEVEL9K_STATUS_SHOW_PIPESTATUS )); then if (( _POWERLEVEL9K_STATUS_SHOW_PIPESTATUS )); then
if (( $#__p9k_pipe_exit_codes > 1 )); then if (( $#__p9k_pipe_exit_codes > 1 )); then
ec_sum=${__p9k_pipe_exit_codes[1]} ec_sum=${__p9k_pipe_exit_codes[1]}
exit_code_or_status "${__p9k_pipe_exit_codes[1]}" _p9k_exit_code_or_status "${__p9k_pipe_exit_codes[1]}"
else else
ec_sum=${__p9k_exit_code} ec_sum=${__p9k_exit_code}
exit_code_or_status "${__p9k_exit_code}" _p9k_exit_code_or_status "${__p9k_exit_code}"
fi fi
ec_text=$_p9k_ret ec_text=$_p9k_ret
for ec in "${(@)__p9k_pipe_exit_codes[2,-1]}"; do for ec in "${(@)__p9k_pipe_exit_codes[2,-1]}"; do
(( ec_sum += ec )) (( ec_sum += ec ))
exit_code_or_status "$ec" _p9k_exit_code_or_status "$ec"
ec_text+="|$_p9k_ret" ec_text+="|$_p9k_ret"
done done
else else
ec_sum=${__p9k_exit_code} ec_sum=${__p9k_exit_code}
# We use __p9k_exit_code instead of the right-most __p9k_pipe_exit_codes item because # We use __p9k_exit_code instead of the right-most __p9k_pipe_exit_codes item because
# PIPE_FAIL may be set. # PIPE_FAIL may be set.
exit_code_or_status "${__p9k_exit_code}" _p9k_exit_code_or_status "${__p9k_exit_code}"
ec_text=$_p9k_ret ec_text=$_p9k_ret
fi fi
if (( ec_sum > 0 )); then if (( ec_sum > 0 )); then
if (( !_POWERLEVEL9K_STATUS_CROSS && _POWERLEVEL9K_STATUS_VERBOSE )); then if (( !_POWERLEVEL9K_STATUS_CROSS && _POWERLEVEL9K_STATUS_VERBOSE )); then
_p9k_cache_val=("$0_ERROR" "$2" red yellow1 CARRIAGE_RETURN_ICON 0 '' "$ec_text") _p9k_cache_val=("$0_ERROR" red yellow1 CARRIAGE_RETURN_ICON 0 '' "$ec_text")
else else
_p9k_cache_val=("$0_ERROR" "$2" "$_p9k_color1" red FAIL_ICON 0 '' '') _p9k_cache_val=("$0_ERROR" "$_p9k_color1" red FAIL_ICON 0 '' '')
fi fi
elif (( _POWERLEVEL9K_STATUS_OK && (_POWERLEVEL9K_STATUS_VERBOSE || _POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE) )); then elif (( _POWERLEVEL9K_STATUS_OK && (_POWERLEVEL9K_STATUS_VERBOSE || _POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE) )); then
_p9k_cache_val=("$0_OK" "$2" "$_p9k_color1" green OK_ICON 0 '' '') _p9k_cache_val=("$0_OK" "$_p9k_color1" green OK_ICON 0 '' '')
else else
return return
fi fi
@ -2042,18 +2043,18 @@ prompt_status() {
_p9k_cache_set "${(@)_p9k_cache_val}" _p9k_cache_set "${(@)_p9k_cache_val}"
fi fi
fi fi
"$1_prompt_segment" "${(@)_p9k_cache_val}" _p9k_prompt_segment "${(@)_p9k_cache_val}"
} }
prompt_prompt_char() { prompt_prompt_char() {
if (( __p9k_exit_code )); then if (( __p9k_exit_code )); then
$1_prompt_segment $0_ERROR_VIINS $2 "$_p9k_color1" 196 '' 0 '${${KEYMAP:-0}:#vicmd}' '❯' _p9k_prompt_segment $0_ERROR_VIINS "$_p9k_color1" 196 '' 0 '${${KEYMAP:-0}:#vicmd}' '❯'
$1_prompt_segment $0_ERROR_VICMD $2 "$_p9k_color1" 196 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd0}' '❮' _p9k_prompt_segment $0_ERROR_VICMD "$_p9k_color1" 196 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd0}' '❮'
$1_prompt_segment $0_ERROR_VIVIS $2 "$_p9k_color1" 196 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd1}' 'Ⅴ' _p9k_prompt_segment $0_ERROR_VIVIS "$_p9k_color1" 196 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd1}' 'Ⅴ'
else else
$1_prompt_segment $0_OK_VIINS $2 "$_p9k_color1" 76 '' 0 '${${KEYMAP:-0}:#vicmd}' '❯' _p9k_prompt_segment $0_OK_VIINS "$_p9k_color1" 76 '' 0 '${${KEYMAP:-0}:#vicmd}' '❯'
$1_prompt_segment $0_OK_VICMD $2 "$_p9k_color1" 76 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd0}' '❮' _p9k_prompt_segment $0_OK_VICMD "$_p9k_color1" 76 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd0}' '❮'
$1_prompt_segment $0_OK_VIVIS $2 "$_p9k_color1" 76 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd1}' 'Ⅴ' _p9k_prompt_segment $0_OK_VIVIS "$_p9k_color1" 76 '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd1}' 'Ⅴ'
fi fi
} }
@ -2083,7 +2084,7 @@ prompt_swap() {
fi fi
_p9k_human_readable_bytes $used_bytes _p9k_human_readable_bytes $used_bytes
$1_prompt_segment $0 $2 yellow "$_p9k_color1" SWAP_ICON 0 '' $_p9k_ret _p9k_prompt_segment $0 yellow "$_p9k_color1" SWAP_ICON 0 '' $_p9k_ret
} }
################################################################ ################################################################
@ -2093,7 +2094,7 @@ prompt_symfony2_tests() {
local -a all=(src/**/*.php(N)) local -a all=(src/**/*.php(N))
local -a code=(${(@)all##*Tests*}) local -a code=(${(@)all##*Tests*})
(( $#code )) || return (( $#code )) || return
build_test_stats "$1" "$0" "$2" "$#code" "$(($#all - $#code))" "SF2" 'TEST_ICON' _p9k_build_test_stats "$0" "$#code" "$(($#all - $#code))" "SF2" 'TEST_ICON'
fi fi
} }
@ -2102,41 +2103,40 @@ prompt_symfony2_tests() {
prompt_symfony2_version() { prompt_symfony2_version() {
if [[ -r app/bootstrap.php.cache ]]; then if [[ -r app/bootstrap.php.cache ]]; then
local v="${$(grep -F " VERSION " app/bootstrap.php.cache 2>/dev/null)//[![:digit:].]}" local v="${$(grep -F " VERSION " app/bootstrap.php.cache 2>/dev/null)//[![:digit:].]}"
"$1_prompt_segment" "$0" "$2" "grey35" "$_p9k_color1" 'SYMFONY_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "grey35" "$_p9k_color1" 'SYMFONY_ICON' 0 '' "${v//\%/%%}"
fi fi
} }
################################################################ ################################################################
# Show a ratio of tests vs code # Show a ratio of tests vs code
build_test_stats() { _p9k_build_test_stats() {
local code_amount="$4" local code_amount="$2"
local tests_amount="$5" local tests_amount="$3"
local headline="$6" local headline="$4"
(( code_amount > 0 )) || return (( code_amount > 0 )) || return
local -F 2 ratio=$(( 100. * tests_amount / code_amount )) local -F 2 ratio=$(( 100. * tests_amount / code_amount ))
(( ratio >= 75 )) && "$1_prompt_segment" "${2}_GOOD" "$3" "cyan" "$_p9k_color1" "$6" 0 '' "$headline: $ratio%%" (( ratio >= 75 )) && _p9k_prompt_segment "${1}_GOOD" "cyan" "$_p9k_color1" "$5" 0 '' "$headline: $ratio%%"
(( ratio >= 50 && ratio < 75 )) && "$1_prompt_segment" "$2_AVG" "$3" "yellow" "$_p9k_color1" "$6" 0 '' "$headline: $ratio%%" (( ratio >= 50 && ratio < 75 )) && _p9k_prompt_segment "$1_AVG" "yellow" "$_p9k_color1" "$5" 0 '' "$headline: $ratio%%"
(( ratio < 50 )) && "$1_prompt_segment" "$2_BAD" "$3" "red" "$_p9k_color1" "$6" 0 '' "$headline: $ratio%%" (( ratio < 50 )) && _p9k_prompt_segment "$1_BAD" "red" "$_p9k_color1" "$5" 0 '' "$headline: $ratio%%"
} }
################################################################ ################################################################
# System time # System time
prompt_time() { prompt_time() {
if (( _POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME )); then if (( _POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME )); then
"$1_prompt_segment" "$0" "$2" "$_p9k_color2" "$_p9k_color1" "TIME_ICON" 0 '' \ _p9k_prompt_segment "$0" "$_p9k_color2" "$_p9k_color1" "TIME_ICON" 0 '' "$_POWERLEVEL9K_TIME_FORMAT"
"$_POWERLEVEL9K_TIME_FORMAT"
else else
local t=${${(%)_POWERLEVEL9K_TIME_FORMAT}//\%/%%} local t=${${(%)_POWERLEVEL9K_TIME_FORMAT}//\%/%%}
if (( _POWERLEVEL9K_TIME_UPDATE_ON_COMMAND )); then if (( _POWERLEVEL9K_TIME_UPDATE_ON_COMMAND )); then
_p9k_escape $t _p9k_escape $t
t=$_p9k_ret t=$_p9k_ret
_p9k_escape $_POWERLEVEL9K_TIME_FORMAT _p9k_escape $_POWERLEVEL9K_TIME_FORMAT
"$1_prompt_segment" "$0" "$2" "$_p9k_color2" "$_p9k_color1" "TIME_ICON" 1 '' \ _p9k_prompt_segment "$0" "$_p9k_color2" "$_p9k_color1" "TIME_ICON" 1 '' \
"\${_p9k_line_finish-$t}\${_p9k_line_finish+$_p9k_ret}" "\${_p9k_line_finish-$t}\${_p9k_line_finish+$_p9k_ret}"
else else
"$1_prompt_segment" "$0" "$2" "$_p9k_color2" "$_p9k_color1" "TIME_ICON" 0 '' $t _p9k_prompt_segment "$0" "$_p9k_color2" "$_p9k_color1" "TIME_ICON" 0 '' $t
fi fi
fi fi
} }
@ -2145,7 +2145,7 @@ prompt_time() {
# System date # System date
prompt_date() { prompt_date() {
local d=${${(%)_POWERLEVEL9K_DATE_FORMAT}//\%/%%} local d=${${(%)_POWERLEVEL9K_DATE_FORMAT}//\%/%%}
"$1_prompt_segment" "$0" "$2" "$_p9k_color2" "$_p9k_color1" "DATE_ICON" 0 '' "$d" _p9k_prompt_segment "$0" "$_p9k_color2" "$_p9k_color1" "DATE_ICON" 0 '' "$d"
} }
################################################################ ################################################################
@ -2164,7 +2164,7 @@ prompt_todo() {
fi fi
fi fi
(( $_p9k_cache_val[1] )) || return (( $_p9k_cache_val[1] )) || return
"$1_prompt_segment" "$0" "$2" "grey50" "$_p9k_color1" 'TODO_ICON' 0 '' "${_p9k_cache_val[2]}" _p9k_prompt_segment "$0" "grey50" "$_p9k_color1" 'TODO_ICON' 0 '' "${_p9k_cache_val[2]}"
} }
################################################################ ################################################################
@ -2343,8 +2343,7 @@ function +vi-svn-detect-changes() {
fi fi
} }
_p9k_vcs_info_init() {
powerlevel9k_vcs_init() {
autoload -Uz vcs_info autoload -Uz vcs_info
local prefix='' local prefix=''
@ -2384,6 +2383,8 @@ powerlevel9k_vcs_init() {
if (( _POWERLEVEL9K_SHOW_CHANGESET )); then if (( _POWERLEVEL9K_SHOW_CHANGESET )); then
zstyle ':vcs_info:*' get-revision true zstyle ':vcs_info:*' get-revision true
else
zstyle ':vcs_info:*' get-revision false
fi fi
} }
@ -2447,7 +2448,7 @@ function _p9k_vcs_render() {
_p9k_vcs_status_restore $_p9k_ret _p9k_vcs_status_restore $_p9k_ret
state=LOADING state=LOADING
else else
$1_prompt_segment prompt_vcs_LOADING $2 "${__p9k_vcs_states[LOADING]}" "$_p9k_color1" VCS_LOADING_ICON 0 '' "$_POWERLEVEL9K_VCS_LOADING_TEXT" _p9k_prompt_segment prompt_vcs_LOADING "${__p9k_vcs_states[LOADING]}" "$_p9k_color1" VCS_LOADING_ICON 0 '' "$_POWERLEVEL9K_VCS_LOADING_TEXT"
return 0 return 0
fi fi
elif [[ $VCS_STATUS_RESULT != ok-* ]]; then elif [[ $VCS_STATUS_RESULT != ok-* ]]; then
@ -2465,7 +2466,7 @@ function _p9k_vcs_render() {
fi fi
fi fi
_p9k_vcs_icon _p9k_vcs_icon
$1_prompt_segment prompt_vcs_$state $2 "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$_p9k_ret" 0 '' "" _p9k_prompt_segment prompt_vcs_$state "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$_p9k_ret" 0 '' ""
return 0 return 0
fi fi
@ -2501,7 +2502,7 @@ function _p9k_vcs_render() {
cache_key+=$VCS_STATUS_COMMIT cache_key+=$VCS_STATUS_COMMIT
fi fi
if ! _p9k_cache_get "$1" "$2" "$state" "${(@)cache_key}"; then if ! _p9k_cache_get "$state" "${(@)cache_key}"; then
local icon local icon
local content local content
@ -2590,10 +2591,10 @@ function _p9k_vcs_render() {
fi fi
fi fi
_p9k_cache_set "prompt_vcs_$state" "$2" "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$icon" 0 '' "$content" _p9k_cache_set "prompt_vcs_$state" "${__p9k_vcs_states[$state]}" "$_p9k_color1" "$icon" 0 '' "$content"
fi fi
$1_prompt_segment "$_p9k_cache_val[@]" _p9k_prompt_segment "$_p9k_cache_val[@]"
return 0 return 0
} }
@ -2679,7 +2680,7 @@ function _p9k_vcs_gitstatus() {
prompt_vcs() { prompt_vcs() {
local -a backends=($_POWERLEVEL9K_VCS_BACKENDS) local -a backends=($_POWERLEVEL9K_VCS_BACKENDS)
if (( ${backends[(I)git]} )) && _p9k_vcs_gitstatus; then if (( ${backends[(I)git]} )) && _p9k_vcs_gitstatus; then
_p9k_vcs_render $1 $2 && return _p9k_vcs_render && return
backends=(${backends:#git}) backends=(${backends:#git})
fi fi
if (( $#backends )); then if (( $#backends )); then
@ -2702,7 +2703,7 @@ prompt_vcs() {
current_state='CLEAN' current_state='CLEAN'
fi fi
fi fi
$1_prompt_segment "${0}_${(U)current_state}" "$2" "${__p9k_vcs_states[$current_state]}" "$_p9k_color1" "$vcs_visual_identifier" 0 '' "$vcs_prompt" _p9k_prompt_segment "${0}_${(U)current_state}" "${__p9k_vcs_states[$current_state]}" "$_p9k_color1" "$vcs_visual_identifier" 0 '' "$vcs_prompt"
fi fi
fi fi
} }
@ -2711,13 +2712,13 @@ prompt_vcs() {
# Vi Mode: show editing mode (NORMAL|INSERT|VISUAL) # Vi Mode: show editing mode (NORMAL|INSERT|VISUAL)
prompt_vi_mode() { prompt_vi_mode() {
if [[ -n $_POWERLEVEL9K_VI_INSERT_MODE_STRING ]]; then if [[ -n $_POWERLEVEL9K_VI_INSERT_MODE_STRING ]]; then
$1_prompt_segment $0_INSERT $2 "$_p9k_color1" blue '' 0 '${${KEYMAP:-0}:#vicmd}' "$_POWERLEVEL9K_VI_INSERT_MODE_STRING" _p9k_prompt_segment $0_INSERT "$_p9k_color1" blue '' 0 '${${KEYMAP:-0}:#vicmd}' "$_POWERLEVEL9K_VI_INSERT_MODE_STRING"
fi fi
if (( $+_POWERLEVEL9K_VI_VISUAL_MODE_STRING )); then if (( $+_POWERLEVEL9K_VI_VISUAL_MODE_STRING )); then
$1_prompt_segment $0_NORMAL $2 "$_p9k_color1" white '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd0}' "$_POWERLEVEL9K_VI_COMMAND_MODE_STRING" _p9k_prompt_segment $0_NORMAL "$_p9k_color1" white '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd0}' "$_POWERLEVEL9K_VI_COMMAND_MODE_STRING"
$1_prompt_segment $0_VISUAL $2 "$_p9k_color1" white '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd1}' "$_POWERLEVEL9K_VI_VISUAL_MODE_STRING" _p9k_prompt_segment $0_VISUAL "$_p9k_color1" white '' 0 '${(M)${:-$KEYMAP$_p9k_region_active}:#vicmd1}' "$_POWERLEVEL9K_VI_VISUAL_MODE_STRING"
else else
$1_prompt_segment $0_NORMAL $2 "$_p9k_color1" white '' 0 '${(M)KEYMAP:#vicmd}' "$_POWERLEVEL9K_VI_COMMAND_MODE_STRING" _p9k_prompt_segment $0_NORMAL "$_p9k_color1" white '' 0 '${(M)KEYMAP:#vicmd}' "$_POWERLEVEL9K_VI_COMMAND_MODE_STRING"
fi fi
} }
@ -2732,7 +2733,7 @@ prompt_virtualenv() {
msg="$_p9k_ret " msg="$_p9k_ret "
fi fi
msg+="$_POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER${${VIRTUAL_ENV:t}//\%/%%}$_POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER" msg+="$_POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER${${VIRTUAL_ENV:t}//\%/%%}$_POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER"
"$1_prompt_segment" "$0" "$2" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg" _p9k_prompt_segment "$0" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg"
} }
function _p9k_read_pyenv_version_file() { function _p9k_read_pyenv_version_file() {
@ -2774,7 +2775,7 @@ prompt_pyenv() {
[[ $v == $_p9k_ret ]] && return [[ $v == $_p9k_ret ]] && return
fi fi
"$1_prompt_segment" "$0" "$2" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "${v//\%/%%}"
} }
################################################################ ################################################################
@ -2783,9 +2784,9 @@ prompt_openfoam() {
local wm_project_version="$WM_PROJECT_VERSION" local wm_project_version="$WM_PROJECT_VERSION"
local wm_fork="$WM_FORK" local wm_fork="$WM_FORK"
if [[ -n "$wm_project_version" && -z "$wm_fork" ]] ; then if [[ -n "$wm_project_version" && -z "$wm_fork" ]] ; then
"$1_prompt_segment" "$0" "$2" "yellow" "$_p9k_color1" '' 0 '' "OF: ${${wm_project_version:t}//\%/%%}" _p9k_prompt_segment "$0" "yellow" "$_p9k_color1" '' 0 '' "OF: ${${wm_project_version:t}//\%/%%}"
elif [[ -n "$wm_project_version" && -n "$wm_fork" ]] ; then elif [[ -n "$wm_project_version" && -n "$wm_fork" ]] ; then
"$1_prompt_segment" "$0" "$2" "yellow" "$_p9k_color1" '' 0 '' "F-X: ${${wm_project_version:t}//\%/%%}" _p9k_prompt_segment "$0" "yellow" "$_p9k_color1" '' 0 '' "F-X: ${${wm_project_version:t}//\%/%%}"
fi fi
} }
@ -2794,14 +2795,14 @@ prompt_openfoam() {
prompt_swift_version() { prompt_swift_version() {
_p9k_cached_cmd_stdout swift --version || return _p9k_cached_cmd_stdout swift --version || return
[[ $_p9k_ret == (#b)[^[:digit:]]#([[:digit:].]##)* ]] || return [[ $_p9k_ret == (#b)[^[:digit:]]#([[:digit:].]##)* ]] || return
"$1_prompt_segment" "$0" "$2" "magenta" "white" 'SWIFT_ICON' 0 '' "${match[1]//\%/%%}" _p9k_prompt_segment "$0" "magenta" "white" 'SWIFT_ICON' 0 '' "${match[1]//\%/%%}"
} }
################################################################ ################################################################
# dir_writable: Display information about the user's permission to write in the current directory # dir_writable: Display information about the user's permission to write in the current directory
prompt_dir_writable() { prompt_dir_writable() {
if [[ ! -w "$PWD" ]]; then if [[ ! -w "$PWD" ]]; then
"$1_prompt_segment" "$0_FORBIDDEN" "$2" "red" "yellow1" 'LOCK_ICON' 0 '' '' _p9k_prompt_segment "$0_FORBIDDEN" "red" "yellow1" 'LOCK_ICON' 0 '' ''
fi fi
} }
@ -2840,7 +2841,7 @@ prompt_kubecontext() {
fi fi
[[ -n $_p9k_cache_val[1] ]] || return [[ -n $_p9k_cache_val[1] ]] || return
$1_prompt_segment $0$_p9k_cache_val[2] $2 magenta white KUBERNETES_ICON 0 '' "${_p9k_cache_val[1]//\%/%%}" _p9k_prompt_segment $0$_p9k_cache_val[2] magenta white KUBERNETES_ICON 0 '' "${_p9k_cache_val[1]//\%/%%}"
} }
################################################################ ################################################################
@ -2857,7 +2858,7 @@ prompt_dropbox() {
dropbox_status="" dropbox_status=""
fi fi
"$1_prompt_segment" "$0" "$2" "white" "blue" "DROPBOX_ICON" 0 '' "${dropbox_status//\%/%%}" _p9k_prompt_segment "$0" "white" "blue" "DROPBOX_ICON" 0 '' "${dropbox_status//\%/%%}"
fi fi
} }
@ -2868,10 +2869,10 @@ prompt_java_version() {
v=${${v#*\"}%\"*} v=${${v#*\"}%\"*}
(( _POWERLEVEL9K_JAVA_VERSION_FULL )) || v=${v%%-*} (( _POWERLEVEL9K_JAVA_VERSION_FULL )) || v=${v%%-*}
[[ -n $v ]] || return [[ -n $v ]] || return
"$1_prompt_segment" "$0" "$2" "red" "white" "JAVA_ICON" 0 '' "${v//\%/%%}" _p9k_prompt_segment "$0" "red" "white" "JAVA_ICON" 0 '' "${v//\%/%%}"
} }
powerlevel9k_preexec() { _p9k_preexec() {
if (( $+_p9k_real_zle_rprompt_indent )); then if (( $+_p9k_real_zle_rprompt_indent )); then
if [[ -n $_p9k_real_zle_rprompt_indent ]]; then if [[ -n $_p9k_real_zle_rprompt_indent ]]; then
ZLE_RPROMPT_INDENT=$_p9k_real_zle_rprompt_indent ZLE_RPROMPT_INDENT=$_p9k_real_zle_rprompt_indent
@ -2886,9 +2887,9 @@ powerlevel9k_preexec() {
function _p9k_build_segment() { function _p9k_build_segment() {
_p9k_segment_name=${_p9k_segment_name%_joined} _p9k_segment_name=${_p9k_segment_name%_joined}
if [[ $_p9k_segment_name == custom_* ]]; then if [[ $_p9k_segment_name == custom_* ]]; then
prompt_custom $_p9k_prompt_side $_p9k_segment_index $_p9k_segment_name[8,-1] _p9k_custom_prompt $_p9k_segment_name[8,-1]
elif (( $+functions[prompt_$_p9k_segment_name] )); then elif (( $+functions[prompt_$_p9k_segment_name] )); then
prompt_$_p9k_segment_name $_p9k_prompt_side $_p9k_segment_index prompt_$_p9k_segment_name
fi fi
((++_p9k_segment_index)) ((++_p9k_segment_index))
} }
@ -2988,7 +2989,9 @@ powerlevel9k_refresh_prompt_inplace() {
_p9k_refresh_reason='' _p9k_refresh_reason=''
} }
powerlevel9k_prepare_prompts() { p9k_refresh_prompt_inplace() { powerlevel9k_refresh_prompt_inplace }
_p9k_precmd() {
__p9k_exit_code=$? __p9k_exit_code=$?
__p9k_pipe_exit_codes=( $pipestatus ) __p9k_pipe_exit_codes=( $pipestatus )
__p9k_timer_end=EPOCHREALTIME __p9k_timer_end=EPOCHREALTIME
@ -3127,8 +3130,8 @@ function _p9k_kill_async_pump() {
_p9k_init_async_pump() { _p9k_init_async_pump() {
local -i public_ip time_realtime local -i public_ip time_realtime
segment_in_use public_ip && public_ip=1 _p9k_segment_in_use public_ip && public_ip=1
segment_in_use time && (( _POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME )) && time_realtime=1 _p9k_segment_in_use time && (( _POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME )) && time_realtime=1
(( public_ip || time_realtime )) || return (( public_ip || time_realtime )) || return
_p9k_start_async_pump() { _p9k_start_async_pump() {
@ -3726,7 +3729,7 @@ _p9k_init_prompt() {
fi fi
if [[ -o TRANSIENT_RPROMPT && -n "$_p9k_line_segments_right[2,-1]" ]] || if [[ -o TRANSIENT_RPROMPT && -n "$_p9k_line_segments_right[2,-1]" ]] ||
( segment_in_use time && (( _POWERLEVEL9K_TIME_UPDATE_ON_COMMAND )) ); then ( _p9k_segment_in_use time && (( _POWERLEVEL9K_TIME_UPDATE_ON_COMMAND )) ); then
_p9k_wrap_zle_widget zle-line-finish _p9k_zle_line_finish _p9k_wrap_zle_widget zle-line-finish _p9k_zle_line_finish
fi fi
} }
@ -3890,13 +3893,13 @@ _p9k_init() {
print -P "remove %F{red}POWERLEVEL9K_RIGHT_SEGMENT_END_SEPARATOR%f from your config" print -P "remove %F{red}POWERLEVEL9K_RIGHT_SEGMENT_END_SEPARATOR%f from your config"
fi fi
if segment_in_use longstatus; then if _p9k_segment_in_use longstatus; then
print -P '%F{yellow}WARNING!%f The "longstatus" segment is deprecated. Use "%F{blue}status%f" instead.' print -P '%F{yellow}WARNING!%f The "longstatus" segment is deprecated. Use "%F{blue}status%f" instead.'
print -P 'For more informations, have a look at https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md.' print -P 'For more informations, have a look at https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md.'
fi fi
if segment_in_use vcs; then if _p9k_segment_in_use vcs; then
powerlevel9k_vcs_init _p9k_vcs_info_init
if [[ $_POWERLEVEL9K_DISABLE_GITSTATUS == 0 && -n $_POWERLEVEL9K_VCS_BACKENDS[(r)git] ]]; then if [[ $_POWERLEVEL9K_DISABLE_GITSTATUS == 0 && -n $_POWERLEVEL9K_VCS_BACKENDS[(r)git] ]]; then
source ${_POWERLEVEL9K_GITSTATUS_DIR:-${__p9k_installation_dir}/gitstatus}/gitstatus.plugin.zsh source ${_POWERLEVEL9K_GITSTATUS_DIR:-${__p9k_installation_dir}/gitstatus}/gitstatus.plugin.zsh
gitstatus_start \ gitstatus_start \
@ -3908,7 +3911,7 @@ _p9k_init() {
fi fi
fi fi
if segment_in_use todo; then if _p9k_segment_in_use todo; then
local todo=$commands[todo.sh] local todo=$commands[todo.sh]
if [[ -n $todo ]]; then if [[ -n $todo ]]; then
local bash=${commands[bash]:-:} local bash=${commands[bash]:-:}
@ -3925,7 +3928,7 @@ _p9k_init() {
fi fi
fi fi
if segment_in_use load; then if _p9k_segment_in_use load; then
case $_p9k_os in case $_p9k_os in
OSX) (( $+commands[sysctl] )) && _p9k_num_cpus=$(sysctl -n hw.logicalcpu 2>/dev/null);; OSX) (( $+commands[sysctl] )) && _p9k_num_cpus=$(sysctl -n hw.logicalcpu 2>/dev/null);;
BSD) (( $+commands[sysctl] )) && _p9k_num_cpus=$(sysctl -n hw.ncpu 2>/dev/null);; BSD) (( $+commands[sysctl] )) && _p9k_num_cpus=$(sysctl -n hw.ncpu 2>/dev/null);;
@ -3933,7 +3936,7 @@ _p9k_init() {
esac esac
fi fi
if segment_in_use dir; then if _p9k_segment_in_use dir; then
if (( $+_POWERLEVEL9K_DIR_CLASSES )); then if (( $+_POWERLEVEL9K_DIR_CLASSES )); then
local -i i=0 local -i i=0
for ((; i <= $#_POWERLEVEL9K_DIR_CLASSES; ++i)); do for ((; i <= $#_POWERLEVEL9K_DIR_CLASSES; ++i)); do
@ -3954,11 +3957,11 @@ _p9k_init() {
_p9k_init_async_pump _p9k_init_async_pump
if segment_in_use vi_mode && (( $+_POWERLEVEL9K_VI_VISUAL_MODE_STRING )) || segment_in_use prompt_char; then if _p9k_segment_in_use vi_mode && (( $+_POWERLEVEL9K_VI_VISUAL_MODE_STRING )) || _p9k_segment_in_use prompt_char; then
_p9k_wrap_zle_widget zle-line-pre-redraw _p9k_zle_line_pre_redraw _p9k_wrap_zle_widget zle-line-pre-redraw _p9k_zle_line_pre_redraw
fi fi
if segment_in_use dir && if _p9k_segment_in_use dir &&
[[ $_POWERLEVEL9K_SHORTEN_STRATEGY == truncate_with_package_name && $+commands[jq] == 0 ]]; then [[ $_POWERLEVEL9K_SHORTEN_STRATEGY == truncate_with_package_name && $+commands[jq] == 0 ]]; then
>&2 print -P '%F{yellow}WARNING!%f %BPOWERLEVEL9K_SHORTEN_STRATEGY=truncate_with_package_name%b requires %F{green}jq%f.' >&2 print -P '%F{yellow}WARNING!%f %BPOWERLEVEL9K_SHORTEN_STRATEGY=truncate_with_package_name%b requires %F{green}jq%f.'
>&2 print -P 'Either install %F{green}jq%f or change the value of %BPOWERLEVEL9K_SHORTEN_STRATEGY%b.' >&2 print -P 'Either install %F{green}jq%f or change the value of %BPOWERLEVEL9K_SHORTEN_STRATEGY%b.'
@ -3983,14 +3986,14 @@ prompt_powerlevel9k_setup() {
typeset -gF __p9k_timer_end=0 typeset -gF __p9k_timer_end=0
typeset -gi __p9k_exit_code=0 typeset -gi __p9k_exit_code=0
typeset -ga __p9k_pipe_exit_codes=() typeset -ga __p9k_pipe_exit_codes=()
add-zsh-hook preexec powerlevel9k_preexec add-zsh-hook preexec _p9k_preexec
add-zsh-hook precmd powerlevel9k_prepare_prompts add-zsh-hook precmd _p9k_precmd
} }
prompt_powerlevel9k_teardown() { prompt_powerlevel9k_teardown() {
emulate -L zsh && setopt no_hist_expand extended_glob emulate -L zsh && setopt no_hist_expand extended_glob
add-zsh-hook -D precmd powerlevel9k_\* add-zsh-hook -D precmd '(_p9k_|powerlevel9k_)*'
add-zsh-hook -D preexec powerlevel9k_\* add-zsh-hook -D preexec '(_p9k_|powerlevel9k_)*'
PROMPT='%m%# ' PROMPT='%m%# '
RPROMPT= RPROMPT=
if (( __p9k_enabled )); then if (( __p9k_enabled )); then

Write Preview
Loading…
Cancel
Save