mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-09 16:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

provider: make :ruby provider check use same code path as :python

Browse Source 
Prior to this change, the provider check for ruby was special-cased and now it
returns E319, like :python etc.

References #9354
This commit is contained in:
Marco Hinz
2018-12-12 03:22:45 +01:00
parent 2f3a18695e
commit 5062d8e0dd
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/eval.c
View File

@@ -10802,17 +10802,6 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
n = true; n = true;
} }
if (STRICMP(name, "ruby") == 0 && n == true) {
char *rubyhost = call_func_retstr("provider#ruby#Detect", 0, NULL, true);
if (rubyhost) {
if (*rubyhost == NUL) {
// Invalid rubyhost executable. Gem is probably not installed.
n = false;
}
xfree(rubyhost);
}
}
rettv->vval.v_number = n; rettv->vval.v_number = n;
} }
@@ -22770,7 +22759,18 @@ bool eval_has_provider(const char *name)
CHECK_PROVIDER(python); CHECK_PROVIDER(python);
return has_python; return has_python;
} else if (strequal(name, "ruby")) { } else if (strequal(name, "ruby")) {
bool need_check_ruby = (has_ruby == -1);
CHECK_PROVIDER(ruby); CHECK_PROVIDER(ruby);
if (need_check_ruby && has_ruby == 1) {
char *rubyhost = call_func_retstr("provider#ruby#Detect", 0, NULL, true);
if (rubyhost) {
if (*rubyhost == NUL) {
// Invalid rubyhost executable. Gem is probably not installed.
has_ruby = 0;
}
xfree(rubyhost);
}
}
return has_ruby; return has_ruby;
} }