From d7b3ac029c302ef3524d3bca96fc2f401eb83dab Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 1 Jan 2019 14:21:53 -0500 Subject: [PATCH] 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. --- runtime/autoload/health/provider.vim | 9 +++++---- 1 file 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)