IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

health.vim: minor refactor (group related logic)

Browse Source
This commit is contained in:
Justin M. Keyes 2017-12-27 13:53:01 +01:00
parent 341102fe9f
commit 2f3e001717
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/autoload/health/provider.vim
View File

@ -370,10 +370,11 @@ function! s:check_python(version) abort
let python_bin = '' let python_bin = ''
endif endif
" Check if $VIRTUAL_ENV is active
let virtualenv_inactive = 0
" Check if $VIRTUAL_ENV is active.
if exists('$VIRTUAL_ENV') if exists('$VIRTUAL_ENV')
let virtualenv_inactive = 0
if !empty(pyenv) if !empty(pyenv)
let pyenv_prefix = resolve(s:trim(s:system([pyenv, 'prefix']))) let pyenv_prefix = resolve(s:trim(s:system([pyenv, 'prefix'])))
if $VIRTUAL_ENV != pyenv_prefix if $VIRTUAL_ENV != pyenv_prefix
@ -382,13 +383,13 @@ function! s:check_python(version) abort
elseif !empty(pyname) && exepath(pyname) !~# '^'.$VIRTUAL_ENV.'/' elseif !empty(pyname) && exepath(pyname) !~# '^'.$VIRTUAL_ENV.'/'
let virtualenv_inactive = 1 let virtualenv_inactive = 1
endif endif
endif
if virtualenv_inactive if virtualenv_inactive
call health#report_warn( call health#report_warn(
\ '$VIRTUAL_ENV exists but appears to be inactive. ' \ '$VIRTUAL_ENV exists but appears to be inactive. '
\ . 'This could lead to unexpected results.', \ . 'This could lead to unexpected results.',
\ [ 'If you are using Zsh, see: http://vi.stackexchange.com/a/7654/5229' ]) \ [ 'If you are using Zsh, see: http://vi.stackexchange.com/a/7654' ])
endif
endif endif
" Diagnostic output " Diagnostic output