diff options
| -rw-r--r-- | src/nvim/eval.c | 28 | ||||
| -rw-r--r-- | test/functional/provider/python3_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/provider/python_spec.lua | 4 |
3 files changed, 25 insertions, 11 deletions
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); diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua index d7ca0bd420..b319d5e948 100644 --- a/test/functional/provider/python3_spec.lua +++ b/test/functional/provider/python3_spec.lua @@ -29,6 +29,10 @@ describe('python3 provider', function() it('feature test', function() eq(1, eval('has("python3")')) + eq(1, eval('has("python3_compiled")')) + eq(1, eval('has("python3_dynamic")')) + eq(0, eval('has("python3_dynamic_")')) + eq(0, eval('has("python3_")')) end) it('python3_execute', function() diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua index eab4b29d3a..986f10b2e9 100644 --- a/test/functional/provider/python_spec.lua +++ b/test/functional/provider/python_spec.lua @@ -37,6 +37,10 @@ end) describe('python feature test', function() it('works', function() eq(1, funcs.has('python')) + eq(1, funcs.has('python_compiled')) + eq(1, funcs.has('python_dynamic')) + eq(0, funcs.has('python_dynamic_')) + eq(0, funcs.has('python_')) end) end) |