aboutsummaryrefslogtreecommitdiff
path: root/runtime/autoload/provider
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-08-04 12:06:24 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-08-04 13:23:46 +0200
commit241956720d02d933b0b27097a3b0a1966f138d0b (patch)
tree374bba71e8dd780fb7f89bd37ab28bbe5752c55e /runtime/autoload/provider
parent66938b928c05b913f3a11e520d13ca854621799d (diff)
downloadrneovim-241956720d02d933b0b27097a3b0a1966f138d0b.tar.gz
rneovim-241956720d02d933b0b27097a3b0a1966f138d0b.tar.bz2
rneovim-241956720d02d933b0b27097a3b0a1966f138d0b.zip
provider: g:loaded_xx_provider=2 means "enabled and working"
Value of 1 cannot be used, because users might set that in their vimrc to _disable_ a provider, which would confuse :checkhealth and has().
Diffstat (limited to 'runtime/autoload/provider')
-rw-r--r--runtime/autoload/provider/clipboard.vim6
-rw-r--r--runtime/autoload/provider/node.vim6
-rw-r--r--runtime/autoload/provider/python.vim2
-rw-r--r--runtime/autoload/provider/python3.vim2
-rw-r--r--runtime/autoload/provider/ruby.vim6
5 files changed, 11 insertions, 11 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 9b79e5abec..ce140b0948 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -5,11 +5,11 @@
if exists('g:loaded_clipboard_provider')
finish
endif
-" Default to FALSE. Set by provider#clipboard#Executable() later.
+" Default to 1. provider#clipboard#Executable() may set 2.
" To force a reload:
" :unlet g:loaded_clipboard_provider
" :runtime autoload/provider/clipboard.vim
-let g:loaded_clipboard_provider = 0
+let g:loaded_clipboard_provider = 1
let s:copy = {}
let s:paste = {}
@@ -197,4 +197,4 @@ function! provider#clipboard#Call(method, args) abort
endfunction
" eval_has_provider() decides based on this variable.
-let g:loaded_clipboard_provider = !empty(provider#clipboard#Executable())
+let g:loaded_clipboard_provider = empty(provider#clipboard#Executable()) ? 1 : 2
diff --git a/runtime/autoload/provider/node.vim b/runtime/autoload/provider/node.vim
index dd2423fe2a..b2a3b3ee08 100644
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -1,7 +1,7 @@
if exists('g:loaded_node_provider')
finish
endif
-let g:loaded_node_provider = 0
+let g:loaded_node_provider = 1
function! s:is_minimum_version(version, min_major, min_minor) abort
if empty(a:version)
@@ -140,9 +140,9 @@ endfunction
let s:err = ''
let s:prog = provider#node#Detect()
-let g:loaded_node_provider = !empty(s:prog)
+let g:loaded_node_provider = empty(s:prog) ? 1 : 2
-if !g:loaded_node_provider
+if g:loaded_node_provider != 2
let s:err = 'Cannot find the "neovim" node package. Try :checkhealth'
endif
diff --git a/runtime/autoload/provider/python.vim b/runtime/autoload/provider/python.vim
index 7921701141..8a1d162784 100644
--- a/runtime/autoload/provider/python.vim
+++ b/runtime/autoload/provider/python.vim
@@ -8,7 +8,7 @@ if exists('g:loaded_python_provider')
finish
endif
let [s:prog, s:err] = provider#pythonx#Detect(2)
-let g:loaded_python_provider = !empty(s:prog)
+let g:loaded_python_provider = empty(s:prog) ? 1 : 2
function! provider#python#Prog() abort
return s:prog
diff --git a/runtime/autoload/provider/python3.vim b/runtime/autoload/provider/python3.vim
index 67350e3753..38ef0cccfc 100644
--- a/runtime/autoload/provider/python3.vim
+++ b/runtime/autoload/provider/python3.vim
@@ -8,7 +8,7 @@ if exists('g:loaded_python3_provider')
finish
endif
let [s:prog, s:err] = provider#pythonx#Detect(3)
-let g:loaded_python3_provider = !empty(s:prog)
+let g:loaded_python3_provider = empty(s:prog) ? 1 : 2
function! provider#python3#Prog() abort
return s:prog
diff --git a/runtime/autoload/provider/ruby.vim b/runtime/autoload/provider/ruby.vim
index f9d4f2b885..f843050df9 100644
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -2,7 +2,7 @@
if exists('g:loaded_ruby_provider')
finish
endif
-let g:loaded_ruby_provider = 0
+let g:loaded_ruby_provider = 1
function! provider#ruby#Detect() abort
return s:prog
@@ -62,9 +62,9 @@ endfunction
let s:err = ''
let s:prog = s:detect()
let s:plugin_path = expand('<sfile>:p:h') . '/script_host.rb'
-let g:loaded_ruby_provider = !empty(s:prog)
+let g:loaded_ruby_provider = empty(s:prog) ? 1 : 2
-if !g:loaded_ruby_provider
+if g:loaded_ruby_provider != 2
let s:err = 'Cannot find the neovim RubyGem. Try :checkhealth'
endif