Merge 672b958a7e into 9253fb1c50

config/p10k-classic.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -951,6 +952,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

config/p10k-lean-8colors.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -926,6 +927,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

config/p10k-lean.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -926,6 +927,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

config/p10k-rainbow.zsh

@@ -47,6 +47,7 @@
     virtualenv              # python virtual environment (https://docs.python.org/3/library/venv.html)
     anaconda                # conda environment (https://conda.io/)
     pyenv                   # python environment (https://github.com/pyenv/pyenv)
+    poetry                  # python poetry (https://python-poetry.org/)
     goenv                   # go environment (https://github.com/syndbg/goenv)
     nodenv                  # node.js version from nodenv (https://github.com/nodenv/nodenv)
     nvm                     # node.js version from nvm (https://github.com/nvm-sh/nvm)
@@ -999,6 +1000,10 @@
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
   typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  # If set to "true", get the virtualenv from poetry if available
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY=false
+  # Show poetry venv only when in a directory tree containing pyproject.toml.
+  typeset -g POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

internal/p10k.zsh

@@ -138,6 +138,14 @@ function getColorCode() {
   return 1
 }
 
+function _p9k_codeset_is_utf8() {
+  # Use `case` to survive SH_GLOB.
+  case "${langinfo[CODESET]}" in
+    utf-8|UTF-8|utf8|UTF8) return 0;;
+    *) return 1;;
+  esac
+}
+
 # _p9k_declare <type> <uppercase-name> [default]...
 function _p9k_declare() {
   local -i set=$+parameters[$2]
@@ -1796,7 +1804,7 @@ prompt_dir() {
   if (( $+_POWERLEVEL9K_SHORTEN_DELIMITER )); then
     local delim=$_POWERLEVEL9K_SHORTEN_DELIMITER
   else
-    if [[ $langinfo[CODESET] == (utf|UTF)(-|)8 ]]; then
+    if _p9k_codeset_is_utf8; then
       local delim=$'\u2026'
     else
       local delim='..'
@@ -4288,6 +4296,44 @@ function _p9k_parse_virtualenv_cfg() {
   reply=(1 "$res")
 }
 
+################################################################
+# Segment to display poetry virtualenv information
+# https://python-poetry.org/
+prompt_poetry() {
+  local msg=''
+  if (( _POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION )) && _p9k_python_version; then
+    msg="${_p9k__ret//\%/%%} "
+  fi
+  _p9k_poetry_compute || return
+  msg+="$P9K_POETRY_PYTHON_VENV"
+  _p9k_prompt_segment "$0" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg"
+}
+
+_p9k_prompt_poetry_init() {
+  typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${commands[poetry]:-${${+functions[poetry]}:#0}}'
+}
+
+function _p9k_poetry_compute() {
+  unset P9K_POETRY_PYTHON_VENV
+  case $_POWERLEVEL9K_VIRTUALENV_SHOW_WITH_POETRY in
+    true)
+      _p9k_upglob pyproject.toml
+      local idx=$?
+      if (( idx == 1 )); then
+        _p9k_cached_cmd 0 $_p9k__parent_dirs[idx]/pyproject.toml poetry env info -p || return
+      elif (( idx > 1 )); then
+        (( _POWERLEVEL9K_POETRY_VENV_PROJECT_ONLY )) && return
+        _p9k_cached_cmd 0 '' poetry env info -p || return
+      fi
+      if [[ $_p9k__ret == (#b)*/([^/]##) ]]; then
+        typeset -g P9K_POETRY_PYTHON_VENV=$match[1]
+        return
+      fi
+    ;;
+  esac
+  return 1
+}
+
 ################################################################
 # Virtualenv: current working virtualenv
 # More information on virtualenv (Python):
@@ -6851,13 +6897,13 @@ function _p9k_restore_special_params() {
 }
 
 function _p9k_on_expand() {
-  (( _p9k__expanded && ! ${+__p9k_instant_prompt_active} )) && [[ "${langinfo[CODESET]}" == (utf|UTF)(-|)8 ]] && return
+  (( _p9k__expanded && ! ${+__p9k_instant_prompt_active} )) && _p9k_codeset_is_utf8 && return
 
   eval "$__p9k_intro_no_locale"
 
-  if [[ $langinfo[CODESET] != (utf|UTF)(-|)8 ]]; then
+  if ! _p9k_codeset_is_utf8; then
     _p9k_restore_special_params
-    if [[ $langinfo[CODESET] != (utf|UTF)(-|)8 ]] && _p9k_init_locale; then
+    if ! _p9k_codeset_is_utf8 && _p9k_init_locale; then
       if [[ -n $LC_ALL ]]; then
         _p9k__real_lc_all=$LC_ALL
         LC_ALL=$__p9k_locale
@@ -7458,7 +7504,7 @@ _p9k_init_params() {
   _p9k_declare -i POWERLEVEL9K_VCS_SHORTEN_LENGTH
   _p9k_declare -i POWERLEVEL9K_VCS_SHORTEN_MIN_LENGTH
   _p9k_declare -s POWERLEVEL9K_VCS_SHORTEN_STRATEGY
-  if [[ $langinfo[CODESET] == (utf|UTF)(-|)8 ]]; then
+  if _p9k_codeset_is_utf8; then
     _p9k_declare -e POWERLEVEL9K_VCS_SHORTEN_DELIMITER '\u2026'
   else
     _p9k_declare -e POWERLEVEL9K_VCS_SHORTEN_DELIMITER '..'
@@ -9519,7 +9565,7 @@ if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file && -n $__p9k_instant_p
   zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
 fi
 
-typeset -g P9K_VERSION=1.20.16
+typeset -g P9K_VERSION=1.20.17
 
 if [[ ${VSCODE_SHELL_INTEGRATION-} == <1-> && ${+__p9k_force_term_shell_integration} == 0 ]]; then
   typeset -gri __p9k_force_term_shell_integration=1

powerlevel10k.zsh-theme

@@ -27,7 +27,13 @@
   local -a match mbegin mend
   local -i MBEGIN MEND OPTIND
   local MATCH OPTARG IFS=$'\'' \t\n\0'\'
-  typeset -gr __p9k_intro_locale='[[ $langinfo[CODESET] != (utf|UTF)(-|)8 ]] && _p9k_init_locale && { [[ -n $LC_ALL ]] && local LC_ALL=$__p9k_locale || local LC_CTYPE=$__p9k_locale }'
+  # Use `case` to survive SH_GLOB.
+  typeset -gr __p9k_intro_locale='{
+    case "${langinfo[CODESET]}" in
+      utf-8|UTF-8|utf8|UTF8) false;;
+      *) true;;
+    esac
+  } && _p9k_init_locale && { [[ -n "$LC_ALL" ]] && local LC_ALL=$__p9k_locale || local LC_CTYPE=$__p9k_locale }'
   typeset -gr __p9k_intro_no_locale="${${__p9k_intro_base/ match / match reply }/ MATCH / MATCH REPLY }"
   typeset -gr __p9k_intro_no_reply="$__p9k_intro_base; $__p9k_intro_locale"
   typeset -gr __p9k_intro="$__p9k_intro_no_locale; $__p9k_intro_locale"