Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-12-22 07:11:58 +00:00
Code Releases Activity

Merge pull request #791 from dritter/local_variables

Browse source 
Make variables local
This commit is contained in:
Ben Hilburn 2018-04-13 21:58:10 -04:00 committed by GitHub
commit 7234d52ebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
functions/colors.zsh
View file

@ -35,11 +35,11 @@ function getColor() {
fi fi
else else
# named color added to parameter expansion print -P to test if the name exists in terminal # named color added to parameter expansion print -P to test if the name exists in terminal
named="%K{$1}" local named="%K{$1}"
# https://misc.flogisoft.com/bash/tip_colors_and_formatting # https://misc.flogisoft.com/bash/tip_colors_and_formatting
default="$'\033'\[49m" local default="$'\033'\[49m"
# http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html # http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html
quoted=$(printf "%q" $(print -P "$named")) local quoted=$(printf "%q" $(print -P "$named"))
if [[ $quoted = "$'\033'\[49m" && $1 != "black" ]]; then if [[ $quoted = "$'\033'\[49m" && $1 != "black" ]]; then
# color not found, so try to get the code # color not found, so try to get the code
1=$(getColorCode $1) 1=$(getColorCode $1)

1
functions/utilities.zsh
View file

@ -39,6 +39,7 @@ printSizeHumanReadable() {
# if the base is not Bytes # if the base is not Bytes
if [[ -n $2 ]]; then if [[ -n $2 ]]; then
local idx
for idx in "${extension[@]}"; do for idx in "${extension[@]}"; do
if [[ "$2" == "$idx" ]]; then if [[ "$2" == "$idx" ]]; then
break break

8
powerlevel9k.zsh-theme
View file

@ -278,7 +278,7 @@ CURRENT_BG='NONE'
prompt_anaconda() { prompt_anaconda() {
# Depending on the conda version, either might be set. This # Depending on the conda version, either might be set. This
# variant works even if both are set. # variant works even if both are set.
_path=$CONDA_ENV_PATH$CONDA_PREFIX local _path=$CONDA_ENV_PATH$CONDA_PREFIX
if ! [ -z "$_path" ]; then if ! [ -z "$_path" ]; then
# config - can be overwritten in users' zshrc file. # config - can be overwritten in users' zshrc file.
set_default POWERLEVEL9K_ANACONDA_LEFT_DELIMITER "(" set_default POWERLEVEL9K_ANACONDA_LEFT_DELIMITER "("
@ -921,7 +921,7 @@ prompt_dir() {
fi fi
# declare variables used for bold and state colors # declare variables used for bold and state colors
local bld dir_state_foreground dir_state_user_foreground local bld_on bld_off dir_state_foreground dir_state_user_foreground
# test if user wants the last directory printed in bold # test if user wants the last directory printed in bold
if [[ "${(L)POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD}" == "true" ]]; then if [[ "${(L)POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD}" == "true" ]]; then
bld_on="%B" bld_on="%B"
@ -1685,6 +1685,7 @@ build_left_prompt() {
# Right prompt # Right prompt
build_right_prompt() { build_right_prompt() {
local index=1 local index=1
local element
for element in "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[@]}"; do for element in "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[@]}"; do
# Remove joined information in direct calls # Remove joined information in direct calls
element=${element%_joined} element=${element%_joined}
@ -1707,6 +1708,7 @@ powerlevel9k_preexec() {
set_default POWERLEVEL9K_PROMPT_ADD_NEWLINE false set_default POWERLEVEL9K_PROMPT_ADD_NEWLINE false
powerlevel9k_prepare_prompts() { powerlevel9k_prepare_prompts() {
local RETVAL RPROMPT_PREFIX RPROMPT_SUFFIX
RETVAL=$? RETVAL=$?
RETVALS=( "$pipestatus[@]" ) RETVALS=( "$pipestatus[@]" )
@ -1741,7 +1743,7 @@ $(print_icon 'MULTILINE_LAST_PROMPT_PREFIX')'
RPROMPT='$RPROMPT_PREFIX%f%b%k$(build_right_prompt)%{$reset_color%}$RPROMPT_SUFFIX' RPROMPT='$RPROMPT_PREFIX%f%b%k$(build_right_prompt)%{$reset_color%}$RPROMPT_SUFFIX'
fi fi
NEWLINE=' local NEWLINE='
' '
if [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]]; then if [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]]; then