From 853683e72a780afef3ecebd8d46e32983abe1798 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 9 Sep 2019 10:54:07 -0700 Subject: provider: has("python3_dynamic") et al. #10980 Vim added more flags for testing yet more dimensions of its Python situation. Handle those in eval_has_provider(). vim-patch:8.0.1436: not enough information about what Python version may work Problem: Not enough information about what Python version may work. Solution: Add "python_compiled", "python3_compiled", "python_dynamic" and "python3_dynamic" values for has(). ref: https://github.com/neovim/neovim/pull/10942#issuecomment-529479500 --- src/nvim/eval.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 0aa0e8c165..b067e03c2f 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -24133,24 +24133,30 @@ typval_T eval_call_provider(char *provider, char *method, list_T *arguments) return rettv; } -/// Checks if a named provider is enabled. -bool eval_has_provider(const char *name) -{ - if (!strequal(name, "clipboard") - && !strequal(name, "python") - && !strequal(name, "python3") - && !strequal(name, "ruby") - && !strequal(name, "node")) { +/// Checks if provider for feature `feat` is enabled. +bool eval_has_provider(const char *feat) +{ + if (!strequal(feat, "clipboard") + && !strequal(feat, "python") + && !strequal(feat, "python3") + && !strequal(feat, "python_compiled") + && !strequal(feat, "python_dynamic") + && !strequal(feat, "python3_compiled") + && !strequal(feat, "python3_dynamic") + && !strequal(feat, "ruby") + && !strequal(feat, "node")) { // Avoid autoload for non-provider has() features. return false; } + char name[32]; // Normalized: "python_compiled" => "python". + snprintf(name, sizeof(name), "%s", feat); + strchrsub(name, '_', '\0'); // Chop any "_xx" suffix. + char buf[256]; - int len; typval_T tv; - // Get the g:loaded_xx_provider variable. - len = snprintf(buf, sizeof(buf), "g:loaded_%s_provider", name); + int len = snprintf(buf, sizeof(buf), "g:loaded_%s_provider", name); if (get_var_tv(buf, len, &tv, NULL, false, true) == FAIL) { // Trigger autoload once. len = snprintf(buf, sizeof(buf), "provider#%s#bogus", name); -- cgit