feat(env): allow nodejs path to be set by the environment (#2079)

neoclide · Jun 19, 2020 · d66d82e · d66d82e
1 parent f00e036
commit d66d82e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/autoload/coc/util.vim b/autoload/coc/util.vim
@@ -325,7 +325,7 @@ function! coc#util#job_command()
   if (has_key(g:, 'coc_node_path'))
     let node = expand(g:coc_node_path)
   else
-    let node = 'node'
+    let node = $COC_NODE_PATH == '' ? 'node' : $COC_NODE_PATH
   endif
   if !executable(node)
     echohl Error | echom '[coc.nvim] "'.node.'" is not executable, checkout https://nodejs.org/en/download/' | echohl None

diff --git a/autoload/health/coc.vim b/autoload/health/coc.vim
@@ -6,7 +6,7 @@ function! s:checkEnvironment() abort
     let valid = 0
     call health#report_error('Neovim version not satisfied, 0.3.0 and above required')
   endif
-  let node = get(g:, 'coc_node_path', 'node')
+  let node = get(g:, 'coc_node_path', $COC_NODE_PATH == '' ? 'node' : $COC_NODE_PATH)
   if !executable(node)
     let valid = 0
     call health#report_error('Executable node.js not found, install node.js from http://nodejs.org/')

diff --git a/plugin/coc.vim b/plugin/coc.vim
@@ -360,7 +360,7 @@ function! s:ShowInfo()
   else
     let lines = []
     echomsg 'coc.nvim service not started, checking environment...'
-    let node = get(g:, 'coc_node_path', 'node')
+    let node = get(g:, 'coc_node_path', $COC_NODE_PATH == '' ? 'node' : $COC_NODE_PATH)
     if !executable(node)
       call add(lines, 'Error: '.node.' is not executable!')
     else