aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2019-01-01 14:21:53 -0500
committerJames McCoy <jamessan@jamessan.com>2019-01-01 20:38:28 -0500
commitd7b3ac029c302ef3524d3bca96fc2f401eb83dab (patch)
tree67bd692a69ad00f47bd09a193821a8248377d1f3 /runtime
parentedeb19d5e9597045a6b3f320948dafd1b7631c16 (diff)
downloadrneovim-d7b3ac029c302ef3524d3bca96fc2f401eb83dab.tar.gz
rneovim-d7b3ac029c302ef3524d3bca96fc2f401eb83dab.tar.bz2
rneovim-d7b3ac029c302ef3524d3bca96fc2f401eb83dab.zip
health/provider: Check for available pynvim when neovim module missing
Adapt the checks so we can still report when the pynvim module is present but the neovim module is missing.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/autoload/health/provider.vim9
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index 8f3e261e99..76eacf338d 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -415,17 +415,18 @@ function! s:check_python(version) abort
call health#report_info('Python version: ' . pyversion)
if s:is_bad_response(status)
call health#report_info(printf('pynvim version: %s (%s)', current, status))
- else
- call health#report_info(printf('pynvim version: %s', current))
let [module_found, _msg] = provider#pythonx#CheckForModule(python_bin,
- \ 'neovim', a:version)
- if !module_found
+ \ 'pynvim', a:version)
+ if status !=? '^outdated' && module_found
+ " neovim module was not found, but pynvim was
call health#report_error('Importing "neovim" failed.',
\ "Reinstall \"pynvim\" and optionally \"neovim\" packages.\n" .
\ pip ." uninstall pynvim neovim\n" .
\ pip ." install pynvim\n" .
\ pip ." install neovim # only if needed by third-party software")
endif
+ else
+ call health#report_info(printf('pynvim version: %s', current))
endif
if s:is_bad_response(current)