kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-31 17:13:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

CheckHealth: Fix version comparison.

Browse Source 
Compare numbers instead of strings.
This commit is contained in:
Justin M. Keyes 2016-11-15 08:27:00 +01:00
parent 01ef6fc3d2
commit d28d108648
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
let s:shell_error = 0 let s:shell_error = 0
function! s:is_bad_response(s) abort function! s:is_bad_response(s) abort
return a:s =~? '\v(^unable)|(^error)' return a:s =~? '\v(^unable)|(^error)|(^outdated)'
endfunction endfunction
function! s:trim(s) abort function! s:trim(s) abort
@ -10,13 +10,13 @@ endfunction
" Simple version comparison. " Simple version comparison.
function! s:version_cmp(a, b) abort function! s:version_cmp(a, b) abort
let a = split(a:a, '\.') let a = split(a:a, '\.', 0)
let b = split(a:b, '\.') let b = split(a:b, '\.', 0)
for i in range(len(a)) for i in range(len(a))
if a[i] > b[i] if str2nr(a[i]) > str2nr(b[i])
return 1 return 1
elseif a[i] < b[i] elseif str2nr(a[i]) < str2nr(b[i])
return -1 return -1
endif endif
endfor endfor
@ -378,7 +378,7 @@ function! s:check_python(version) abort
endif endif
call health#report_info('Python'.a:version.' version: ' . pyversion) call health#report_info('Python'.a:version.' version: ' . pyversion)
call health#report_info(printf('%s-neovim Version: %s', python_bin_name, current)) call health#report_info(printf('%s-neovim version: %s', python_bin_name, current))
if s:is_bad_response(current) if s:is_bad_response(current)
let suggestions = [ let suggestions = [
@ -396,9 +396,11 @@ function! s:check_python(version) abort
endif endif
if s:is_bad_response(status) if s:is_bad_response(status)
call health#report_warn('Latest Neovim Python client version: ('.latest.')') call health#report_warn(printf('Latest %s-neovim is NOT installed: %s',
\ python_bin_name, latest))
elseif !s:is_bad_response(latest) elseif !s:is_bad_response(latest)
call health#report_ok('Latest Neovim Python client is installed: ('.status.')') call health#report_ok(printf('Latest %s-neovim is installed: %s',
\ python_bin_name, latest))
endif endif
endif endif