Skip to content

Commit

Permalink
Aggressive refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@lambdalisue
lambdalisue committed May 28, 2015
1 parent f53ae1f commit a112d1b
Show file tree
Hide file tree
Showing 29 changed files with 4,237 additions and 566 deletions.
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ session](./statics/_screenshot01.png)
Additionally, vim-pyenv supports Vim's dual Python 2 and 3 system.
If your Vim is compiled with +python and +python3, vim-pyenv automatically
synchronizes the Python version to the external Python version.
If you are using jedi-vim, vim-pyenv automatically changes the Python version
of jedi-vim as well thus omni-completion works in both Python 2 and Python 3.

![jedi-vim omni completion works correctly](./statics/_screenshot02.png)

Expand Down
328 changes: 62 additions & 266 deletions autoload/pyenv.vim
View file
Original file line number Diff line number Diff line change
@@ -1,283 +1,79 @@
"==============================================================================
" vim-pyenv
"
" Correctly import modules of pyenv specified python.
"
" Author: Alsiue <lambdalisue@hashnote.net>
" License: MIT license
"==============================================================================
let s:save_cpo = &cpo
set cpo&vim

" Variables
let s:repository_root = fnameescape(expand('<sfile>:p:h:h'))

"------------------------------------------------------------------------------
" Utility functions
"------------------------------------------------------------------------------
" call pyenv with args
function! s:pyenv(args)
return system(g:pyenv#pyenv_exec . " " . a:args)
endfunction

" call external python with args
function! s:external_python(args)
return system(g:pyenv#python_exec . " " . a:args)
endfunction

"------------------------------------------------------------------------------
" pyenv manipulation
"------------------------------------------------------------------------------
" return the name of selected environment on pyenv
function! pyenv#pyenv_name()
return split(s:pyenv('version'))[0]
endfunction

function! pyenv#display_pyenv_name()
echo pyenv#pyenv_name()
endfunction

" return the activated pyenv python name
function! pyenv#activated_pyenv_name()
if exists('g:pyenv#activated_name')
return g:pyenv#activated_name
else
return ""
endif
endfunction

function! pyenv#display_activated_pyenv_name()
echo pyenv#activated_pyenv_name()
endfunction

" return the list of installed environment names on pyenv
" The result can be filtered with `prefix`
function! pyenv#pyenv_names(prefix)
let original = split(s:pyenv("versions"), "\n")
let venvs = []
for row in original
if len(row) <= 3
continue
endif
" remove selection marker and address
let name = split(substitute(row, "\*", "", "g"))[0]
" add item which start from prefix
if name =~ '^'.a:prefix
call add(venvs, name)
function! s:activate(...) abort " {{{
if pyenv#pyenv#is_activated()
call s:deactivate({'quiet': 1})
endif
let envs = pyenv#pyenv#get_selected_envs()
let env = get(a:000, 0, '')
let env = empty(env) ? get(envs, 0, 'system') : env
let opts = extend({
\ 'quiet': 0,
\}, get(a:000, 1, {}))
" activate pyenv and select correct python
if pyenv#pyenv#activate(env)
" automatically select a correct python major version
" and regulate sys.path
call pyenv#python#auto_internal_major_version()
call pyenv#python#exec_code(
\ 'pyenv_vim.activate(vim.vars["pyenv#python_exec"])')
call pyenv#utils#doautocmd('activate-post')
if !opts.quiet
redraw! | call pyenv#utils#info(printf(
\'vim-pyenv: "%s" is activated.', env,
\))
endif
endfor
return venvs
endfunction

" display the list of installed environment names on pyenv
function! pyenv#display_pyenv_names()
for name in pyenv#pyenv_names("")
echo name
endfor
endfunction


"------------------------------------------------------------------------------
" python (internal/external) manipulation
"------------------------------------------------------------------------------
" return the pyenv running mode
function! pyenv#py_mode()
if has('python') && has('python3')
return "dual"
elseif has('python')
return "2"
elseif has('python3')
return "3"
else
return "disabled"
endif
endfunction

" return the version of internal python
function! pyenv#py_version()
PyenvPython pyenv_vim.py_version()
return return_value
endfunction

function! pyenv#display_py_version()
echo pyenv#py_version()
endfunction

" return the version of external python
function! pyenv#external_py_version()
let py_version = s:external_python("--version")
return split(py_version)[1]
endfunction

function! pyenv#display_external_py_version()
echo pyenv#external_py_version()
endfunction

"------------------------------------------------------------------------------
" main
"------------------------------------------------------------------------------
" force internal python version
function! pyenv#force_py_version(py_version, verbose)
let filename = s:repository_root . "/initialize.py"
if a:py_version == 2
command! -nargs=1 PyenvPython python <args>
execute 'pyfile ' . filename
elseif a:py_version == 3
command! -nargs=1 PyenvPython python3 <args>
execute 'py3file ' . filename
endif
" did internal python version changed?
if !exists('g:pyenv#internal_py_version') ||
\ g:pyenv#internal_py_version != a:py_version
if a:verbose > 0
echomsg "Python " . a:py_version . " is activated."
endfunction " }}}
function! s:deactivate(...) abort " {{{
let opts = extend({
\ 'quiet': 0,
\}, get(a:000, 0, {}))
if pyenv#pyenv#is_activated()
let env = pyenv#pyenv#get_activated_env()
" reset 'sys.path' of internal python
call pyenv#python#exec_code('pyenv_vim.deactivate()')
" deactivate pyenv and select correct python
call pyenv#pyenv#deactivate()
call pyenv#python#auto_internal_major_version()
call pyenv#utils#doautocmd('deactivate-post')
if !opts.quiet
redraw! | call pyenv#utils#info(printf(
\'vim-pyenv: "%s" is deactivated.', env,
\))
endif
let g:pyenv#internal_py_version = a:py_version
endif
" jedi?
if get(g:, 'pyenv#jedi#auto_force_py_version', 1) == 1
call pyenv#jedi#force_py_version(a:py_version, a:verbose)
endfunction " }}}
function! s:validate() abort " {{{
if !pyenv#pyenv#is_enabled()
call pyenv#utils#error(
\ '"pyenv" is not found in $PATH.',
\ 'Specify g:pyenv#pyenv_exec',
\)
return 0
elseif !pyenv#python#is_enabled()
call pyenv#utils#error(
\ 'vim-pyenv requires Python and/or Python3 interpreter (+python, +python3).',
\)
return 0
endif
endfunction
return 1
endfunction " }}}

function! pyenv#auto_force_py_version(verbose)
if !(has('python') && has('python3'))
echoerr "pyenv#auto_force_py_version feature require +python and +python3"
return
endif

let external_py_version = pyenv#external_py_version()
let external_py_version = split(external_py_version, '\.')[0]

call pyenv#force_py_version(external_py_version, a:verbose)
endfunction

" activate the specified name of the pyenv
function! pyenv#activate(name, verbose)
if g:pyenv#enable == 0
finish
function! pyenv#activate(...) abort " {{{
if s:validate()
return call('s:activate', a:000)
endif

if exists("g:pyenv#activated_name")
" deactivate pyenv first
call pyenv#deactivate(0)
endfunction " }}}
function! pyenv#deactivate(...) abort " {{{
if s:validate()
return call('s:deactivate', a:000)
endif
endfunction " }}}

let name = a:name
let current_name = pyenv#pyenv_name()
if len(name) == 0
" the name is not specified thus use current pyenv
let name = current_name
elseif name != current_name || len(current_name) == 0
" new pyenv name is specified, activate the new one
let $PYENV_VERSION = name
call s:pyenv("shell " . name)
endif
" automatically force py version on vim-pyenv
if g:pyenv#auto_force_py_version
call pyenv#auto_force_py_version(a:verbose)
endif
" update the sys.path of internal python
PyenvPython pyenv_vim.activate(vim.vars['pyenv#python_exec'])
let g:pyenv#activated_name = name
if a:verbose
echomsg "'" . name . "' is activated."
endif
endfunction

" deactivate the pyenv
function! pyenv#deactivate(verbose)
if g:pyenv#enable == 0
finish
endif

if exists("g:pyenv#activated_name")
" deactivate pyenv
let $PYENV_VERSION = ""
call s:pyenv("shell --unset")
" automatically force py version on vim-pyenv
if g:pyenv#auto_force_py_version
call pyenv#auto_force_py_version(a:verbose)
endif
" restore the sys.path of internal python
PyenvPython pyenv_vim.deactivate()
if a:verbose
echomsg "'" . g:pyenv#activated_name . "' is deactivated."
endif
unlet! g:pyenv#activated_name
endif
endfunction


"------------------------------------------------------------------------------
" default settings
"------------------------------------------------------------------------------
let s:settings = {
\ 'enable': 1,
\ 'auto_activate': 1,
\ 'auto_force_py_version': has('python') && has('python3'),
\ 'auto_force_py_version_jedi': 1,
\ 'pyenv_root': "'auto'",
\ }

function! s:init()
for [key, val] in items(s:settings)
if !exists('g:pyenv#'.key)
exe 'let g:pyenv#'.key.' = '.val
endif
endfor
" automatically detect the pyenv root
if g:pyenv#pyenv_root == 'auto'
let default_pyenv_root = "~/.pyenv"
if $PYENV_ROOT != ""
let g:pyenv#pyenv_root = $PYENV_ROOT
elseif isdirectory(expand(default_pyenv_root))
let g:pyenv#pyenv_root = default_pyenv_root
else
echoerr "vim-pyenv cannot find the pyenv root directory."
echoerr "Please specify the executable pyenv path by g:pyenv#pyenv_root"
let g:pyenv#enable = 0
finish
endif
let g:pyenv#pyenv_root = expand(g:pyenv#pyenv_root)
endif
if !exists('g:pyenv#pyenv_exec')
if filereadable(g:pyenv#pyenv_root."/bin/pyenv")
" if the pyenv is installed with git command
let g:pyenv#pyenv_exec = g:pyenv#pyenv_root . "/bin/pyenv"
elseif filereadable("/usr/local/bin/pyenv")
" if the pyenv is installed with homebrew
let g:pyenv#pyenv_exec = "/usr/local/bin/pyenv"
elseif executable("pyenv")
" other
let g:pyenv#pyenv_exec = "pyenv"
endif
if !executable(g:pyenv#pyenv_exec)
let g:pyenv#enable = 0
endif
endif
if !exists('g:pyenv#python_exec')
let g:pyenv#python_exec = g:pyenv#pyenv_root . "/shims/python"
endif
endfunction

call s:init()

" ------------------------------------------------------------------------
" python initialization
" ------------------------------------------------------------------------
if pyenv#py_mode() == "dual"
call pyenv#auto_force_py_version(0)
elseif pyenv#py_mode() == "2"
call pyenv#force_py_version(2, 0)
elseif pyenv#py_mode() == "3"
call pyenv#force_py_version(3, 0)
else
if !exists("g:pyenv#squelch_py_warning")
echoerr "vim-pyenv requires vim compiled with +python and/or +python3"
endif
finish
end

let &cpo = s:save_cpo
unlet! s:save_cpo
Loading

0 comments on commit a112d1b

Please sign in to comment.