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

Merge pull request #1148 from dritter/remove_nodeenv_disable_prompt

Browse source 
Remove checking for NODEENV_DISABLE_PROMPT
This commit is contained in:
Dominik Ritter 2019-02-01 17:06:10 +01:00 committed by GitHub
commit 5c7d1009de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -116,7 +116,7 @@ The segments that are currently available are:
* `go_version` - Show the current GO version. * `go_version` - Show the current GO version.
* **Javascript / Node.js Segments:** * **Javascript / Node.js Segments:**
* `node_version` - Show the version number of the installed Node.js. * `node_version` - Show the version number of the installed Node.js.
* `nodeenv` - [nodeenv](https://github.com/ekalinin/nodeenv) prompt for displaying node version and environment name. * [`nodeenv`](#nodeenv) - [nodeenv](https://github.com/ekalinin/nodeenv) prompt for displaying node version and environment name.
* `nvm` - Show the version of Node that is currently active, if it differs from the version used by NVM * `nvm` - Show the version of Node that is currently active, if it differs from the version used by NVM
* **PHP Segments:** * **PHP Segments:**
* `php_version` - Show the current PHP version. * `php_version` - Show the current PHP version.
@ -557,6 +557,12 @@ prompt itself.
This only works on the left side. On the right side it does nothing. This only works on the left side. On the right side it does nothing.
##### nodeenv
Shows the currently used [nodeenv](https://github.com/ekalinin/nodeenv). To avoid
Nodeenvs activate command from interfering with Powerlevel9k, you should set
`NODE_VIRTUAL_ENV_DISABLE_PROMPT=1` in your `~/.zshrc`.
##### rbenv ##### rbenv
This segment shows the version of Ruby being used when using `rbenv` to change your current Ruby stack. This segment shows the version of Ruby being used when using `rbenv` to change your current Ruby stack.

5
powerlevel9k.zsh-theme
View file

@ -1238,9 +1238,8 @@ prompt_nvm() {
################################################################ ################################################################
# Segment to display NodeEnv # Segment to display NodeEnv
prompt_nodeenv() { prompt_nodeenv() {
local nodeenv_path="$NODE_VIRTUAL_ENV" if [[ -n "$NODE_VIRTUAL_ENV" ]]; then
if [[ -n "$nodeenv_path" && "$NODE_VIRTUAL_ENV_DISABLE_PROMPT" != true ]]; then local info="$(node -v)[${NODE_VIRTUAL_ENV:t}]"
local info="$(node -v)[$(basename "$nodeenv_path")]"
"$1_prompt_segment" "$0" "$2" "black" "green" "$info" 'NODE_ICON' "$1_prompt_segment" "$0" "$2" "black" "green" "$info" 'NODE_ICON'
fi fi
} }

20
test/segments/nodeenv.spec
View file

@ -44,26 +44,6 @@ function testNodeenvSegmentPrintsNothingIfNodeVirtualEnvIsNotSet() {
unfunction node unfunction node
} }
function testNodeenvSegmentPrintsNothingIfNodeVirtualEnvDisablePromptIsSet() {
local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(nodeenv custom_world)
local POWERLEVEL9K_CUSTOM_WORLD='echo world'
node() {
echo "v1.2.3"
}
NODE_VIRTUAL_ENV="node-env"
NODE_VIRTUAL_ENV_DISABLE_PROMPT=true
# Load Powerlevel9k
source powerlevel9k.zsh-theme
assertEquals "%K{007} %F{000}world %k%F{007}%f " "$(build_left_prompt)"
unset NODE_VIRTUAL_ENV_DISABLE_PROMPT
unset NODE_VIRTUAL_ENV
unfunction node
}
function testNodeenvSegmentPrintsAtLeastNodeEnvWithoutNode() { function testNodeenvSegmentPrintsAtLeastNodeEnvWithoutNode() {
local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(nodeenv) POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(nodeenv)