Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 7 insertions, 11 deletions

diff --git a/runtime/autoload/provider/node.vim b/runtime/autoload/provider/node.vim
index 87af0094fe..3e7b8b4ef9 100644
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -3,7 +3,7 @@ if exists('g:loaded_node_provider')
 endif
 let g:loaded_node_provider = 1
 
-function! s:is_minimum_version(version, min_major, min_minor) abort
+function! s:is_minimum_version(version, min_version) abort
   if empty(a:version)
     let nodejs_version = get(split(system(['node', '-v']), "\n"), 0, '')
     if v:shell_error || nodejs_version[0] !=# 'v'
@@ -15,11 +15,7 @@ function! s:is_minimum_version(version, min_major, min_minor) abort
   " Remove surrounding junk.  Example: 'v4.12.0' => '4.12.0'
   let nodejs_version = matchstr(nodejs_version, '\(\d\.\?\)\+')
   " [major, minor, patch]
-  let v_list = split(nodejs_version, '\.')
-  return len(v_list) == 3
-    \ && ((str2nr(v_list[0]) > str2nr(a:min_major))
-    \     || (str2nr(v_list[0]) == str2nr(a:min_major)
-    \         && str2nr(v_list[1]) >= str2nr(a:min_minor)))
+  return !v:lua.vim.version.lt(nodejs_version, a:min_version)
 endfunction
 
 let s:NodeHandler = {
@@ -43,20 +39,20 @@ function! provider#node#can_inspect() abort
   if v:shell_error || ver[0] !=# 'v'
     return 0
   endif
-  return (ver[1] ==# '6' && s:is_minimum_version(ver, 6, 12))
-    \ || s:is_minimum_version(ver, 7, 6)
+  return (ver[1] ==# '6' && s:is_minimum_version(ver, '6.12.0'))
+    \ || s:is_minimum_version(ver, '7.6.0')
 endfunction
 
 function! provider#node#Detect() abort
-  let minver = [6, 0]
+  let minver = '6.0.0'
   if exists('g:node_host_prog')
     return [expand(g:node_host_prog, v:true), '']
   endif
   if !executable('node')
     return ['', 'node not found (or not executable)']
   endif
-  if !s:is_minimum_version(v:null, minver[0], minver[1])
-    return ['', printf('node version %s.%s not found', minver[0], minver[1])]
+  if !s:is_minimum_version(v:null, minver)
+    return ['', printf('node version %s not found', minver)]
   endif
 
   let npm_opts = {}