ba1732833b81c69df5135825d38ea9d889d1aa47

Author
Paul <41666738+kutukvpavel@users.noreply.github.com>
Committer
GitHub <noreply@github.com>
Date

Message

feat(jonathan): add virtualenv support (#12705)

Co-authored-by: paul <paul@MAINPC>

Diff

 1diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
 2index e8c49088466b53ce36dcc3d8f688754acdcc21f0..da6ed2281d7795c5f98c06289c6de59c32fa26ff 100644
 3--- a/themes/jonathan.zsh-theme
 4+++ b/themes/jonathan.zsh-theme
 5@@ -7,14 +7,15 @@ function theme_precmd {
 6   local promptsize=${#${(%):---(%n@%m:%l)---()--}}
 7   local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
 8   local pwdsize=${#${(%):-%~}}
 9+  local venvpromptsize=$((${#$(virtualenv_prompt_info)}))
10 
11   # Truncate the path if it's too long.
12-  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
13+  if (( promptsize + rubypromptsize + pwdsize + venvpromptsize > TERMWIDTH )); then
14     (( PR_PWDLEN = TERMWIDTH - promptsize ))
15   elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
16-    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
17+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize ) ))::${PR_HBAR}:)}"
18   else
19-    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
20+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
21   fi
22 }
23 
24@@ -103,7 +104,7 @@ fi
25 PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
26 ${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
27 ${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
28-${PR_GREY})$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
29+${PR_GREY})$(virtualenv_prompt_info)$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
30 ${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
31 ${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
32