3 files changed, 72 insertions, 29 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 87a0315073..b763d28570 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -71,6 +71,12 @@ function! provider#clipboard#Executable() abort
     let s:paste['*'] = s:paste['+']
     let s:cache_enabled = 0
     return 'pbcopy'
+  elseif exists('$WAYLAND_DISPLAY') && executable('wl-copy') && executable('wl-paste')
+    let s:copy['+'] = 'wl-copy --foreground'
+    let s:paste['+'] = 'wl-paste --no-newline'
+    let s:copy['*'] = 'wl-copy --foreground --primary'
+    let s:paste['*'] = 'wl-paste --no-newline --primary'
+    return 'wl-copy'
   elseif exists('$DISPLAY') && executable('xsel') && s:cmd_ok('xsel -o -b')
     let s:copy['+'] = 'xsel --nodetach -i -b'
     let s:paste['+'] = 'xsel -o -b'
diff --git a/runtime/autoload/provider/node.vim b/runtime/autoload/provider/node.vim
index 1c83289740..48ea10aed6 100644
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -22,26 +22,14 @@ function! s:is_minimum_version(version, min_major, min_minor) abort
     \         && str2nr(v_list[1]) >= str2nr(a:min_minor)))
 endfunction
 
-function! s:find_node_client(package_manager) abort
-  if !executable(a:package_manager)
-    return ''
-  endif
-  let is_yarn = a:package_manager ==# 'yarn'
-  let cmd = is_yarn ? 'yarn global dir' : 'npm --loglevel silent root -g'
-  let global_modules_dir = get(split(system(cmd), "\n"), 0, '')
-  if v:shell_error || !isdirectory(global_modules_dir)
-    return ''
-  endif
-  " `yarn global dir` returns the parent of '/node_modules'.
-  let global_modules_dir = is_yarn ? global_modules_dir . '/node_modules' : global_modules_dir
-  if !isdirectory(global_modules_dir)
-    return ''
-  endif
-  let entry_point = global_modules_dir . '/neovim/bin/cli.js'
-  if !filereadable(entry_point)
-    return ''
-  endif
-  return entry_point
+let s:NodeHandler = {
+\ 'stdout_buffered': v:true,
+\ 'result': ''
+\ }
+function! s:NodeHandler.on_exit(job_id, data, event) abort
+  let bin_dir = join(get(self, 'stdout', []), '')
+  let entry_point = bin_dir . self.entry_point
+  let self.result = filereadable(entry_point) ? entry_point : ''
 endfunction
 
 " Support for --inspect-brk requires node 6.12+ or 7.6+ or 8+
@@ -66,9 +54,46 @@ function! provider#node#Detect() abort
   if !s:is_minimum_version(v:null, 6, 0)
     return ''
   endif
-  let entry_point = s:find_node_client('npm')
-  let entry_point = !empty(entry_point) ? entry_point : s:find_node_client('yarn')
-  return entry_point
+
+  let npm_opts = {}
+  if executable('npm')
+    let npm_opts = deepcopy(s:NodeHandler)
+    let npm_opts.entry_point = '/neovim/bin/cli.js'
+    let npm_opts.job_id = jobstart('npm --loglevel silent root -g', npm_opts)
+  endif
+
+  let yarn_opts = {}
+  if executable('yarn')
+    let yarn_opts = deepcopy(s:NodeHandler)
+    let yarn_opts.entry_point = '/node_modules/neovim/bin/cli.js'
+    " `yarn global dir` is slow (> 250ms), try the default path first
+    " XXX: The following code is not portable
+    " https://github.com/yarnpkg/yarn/issues/2049#issuecomment-263183768
+    if has('unix')
+      let yarn_default_path = $HOME . '/.config/yarn/global/' . yarn_opts.entry_point
+      if filereadable(yarn_default_path)
+        return yarn_default_path
+      endif
+    endif
+    let yarn_opts.job_id = jobstart('yarn global dir', yarn_opts)
+  endif
+
+  " npm returns the directory faster, so let's check that first
+  if !empty(npm_opts)
+    let result = jobwait([npm_opts.job_id])
+    if result[0] == 0 && npm_opts.result != ''
+      return npm_opts.result
+    endif
+  endif
+
+  if !empty(yarn_opts)
+    let result = jobwait([yarn_opts.job_id])
+    if result[0] == 0 && yarn_opts.result != ''
+      return yarn_opts.result
+    endif
+  endif
+
+  return ''
 endfunction
 
 function! provider#node#Prog() abort
diff --git a/runtime/autoload/provider/ruby.vim b/runtime/autoload/provider/ruby.vim
index 2fe3817512..ed9436750b 100644
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -5,11 +5,7 @@ endif
 let g:loaded_ruby_provider = 1
 
 function! provider#ruby#Detect() abort
-  if exists("g:ruby_host_prog")
-    return g:ruby_host_prog
-  else
-    return has('win32') ? exepath('neovim-ruby-host.bat') : exepath('neovim-ruby-host')
-  end
+  return s:prog
 endfunction
 
 function! provider#ruby#Prog() abort
@@ -47,8 +43,24 @@ function! provider#ruby#Call(method, args) abort
   return call('rpcrequest', insert(insert(a:args, 'ruby_'.a:method), s:host))
 endfunction
 
+function! s:detect()
+  if exists("g:ruby_host_prog")
+    return g:ruby_host_prog
+  elseif has('win32')
+    return exepath('neovim-ruby-host.bat')
+  else
+    let p = exepath('neovim-ruby-host')
+    if empty(p)
+      return ''
+    endif
+    " neovim-ruby-host could be an rbenv shim for another Ruby version.
+    call system(p)
+    return v:shell_error ? '' : p
+  end
+endfunction
+
 let s:err = ''
-let s:prog = provider#ruby#Detect()
+let s:prog = s:detect()
 let s:plugin_path = expand('<sfile>:p:h') . '/script_host.rb'
 
 if empty(s:prog)