vim/vim-airline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the virtualenv extension work better

Browse Source 
This fixes #511

It allows the virtualenv plugin to call back and tell the airline plugin
to update the statusline. Therefore, the new function
airline#extensions#virtualenv#update() is provided. However, to properly
fix this issue, the virtualenv plugin needs to call this function.

Second, depending on $VIRTUAL_ENV is not safe, since the virtualenv
plugin might define it itsself when calling :VirtualEnvActivate
Therefore skip this test and just test for existance of he
:VirtualEnvList command.
This commit is contained in:
Christian Brabandt 2016-01-20 20:02:21 +01:00
parent dcfe24bc6d
commit 7ace10651f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/airline/extensions.vim
View File

@ -189,7 +189,7 @@ function! airline#extensions#load()
call airline#extensions#bufferline#init(s:ext) call airline#extensions#bufferline#init(s:ext)
endif endif
if isdirectory($VIRTUAL_ENV) && get(g:, 'airline#extensions#virtualenv#enabled', 1) if (get(g:, 'airline#extensions#virtualenv#enabled', 1) && exists(':VirtualEnvList'))
call airline#extensions#virtualenv#init(s:ext) call airline#extensions#virtualenv#init(s:ext)
endif endif

14
autoload/airline/extensions/virtualenv.vim
View File

@ -1,10 +1,6 @@
" MIT License. Copyright (c) 2013-2016 Bailey Ling. " MIT License. Copyright (c) 2013-2016 Bailey Ling.
" vim: et ts=2 sts=2 sw=2 " vim: et ts=2 sts=2 sw=2
if !isdirectory($VIRTUAL_ENV)
finish
endif
let s:spc = g:airline_symbols.space let s:spc = g:airline_symbols.space
function! airline#extensions#virtualenv#init(ext) function! airline#extensions#virtualenv#init(ext)
@ -12,14 +8,22 @@ function! airline#extensions#virtualenv#init(ext)
endfunction endfunction
function! airline#extensions#virtualenv#apply(...) function! airline#extensions#virtualenv#apply(...)
if &filetype =~ "python" if &filetype =~# "python"
if get(g:, 'virtualenv_loaded', 0) if get(g:, 'virtualenv_loaded', 0)
let statusline = virtualenv#statusline() let statusline = virtualenv#statusline()
else else
let statusline = fnamemodify($VIRTUAL_ENV, ':t') let statusline = fnamemodify($VIRTUAL_ENV, ':t')
endif endif
if !empty(statusline)
call airline#extensions#append_to_section('x', call airline#extensions#append_to_section('x',
\ s:spc.g:airline_right_alt_sep.s:spc.statusline) \ s:spc.g:airline_right_alt_sep.s:spc.statusline)
endif endif
endif
endfunction endfunction
function! airline#extensions#virtualenv#update()
if &filetype =~# "python"
call airline#extensions#virtualenv#apply()
call airline#update_statusline()
endif
endfunction