From f195345c936eaecf423ab79473003e1ab337a17d Mon Sep 17 00:00:00 2001 From: Shougo Date: Mon, 31 Jan 2022 23:06:46 +0900 Subject: [RFC] fix: has('python') error (#17252) * fix: has('python') error * fix: functional tests --- src/nvim/eval.c | 3 --- test/functional/fixtures/autoload/provider/python.vim | 6 ------ test/functional/fixtures/autoload/provider/python3.vim | 6 ++++++ test/functional/provider/provider_spec.lua | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 test/functional/fixtures/autoload/provider/python.vim create mode 100644 test/functional/fixtures/autoload/provider/python3.vim diff --git a/src/nvim/eval.c b/src/nvim/eval.c index cf3322df1b..b8e9f41551 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11004,10 +11004,7 @@ typval_T eval_call_provider(char *provider, char *method, list_T *arguments, boo 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, "perl") diff --git a/test/functional/fixtures/autoload/provider/python.vim b/test/functional/fixtures/autoload/provider/python.vim deleted file mode 100644 index d68360ac30..0000000000 --- a/test/functional/fixtures/autoload/provider/python.vim +++ /dev/null @@ -1,6 +0,0 @@ -" Dummy test provider, missing this required variable: -" let g:loaded_brokenenabled_provider = 0 - -function! provider#python#Call(method, args) - return 42 -endfunction diff --git a/test/functional/fixtures/autoload/provider/python3.vim b/test/functional/fixtures/autoload/provider/python3.vim new file mode 100644 index 0000000000..8ed4330a35 --- /dev/null +++ b/test/functional/fixtures/autoload/provider/python3.vim @@ -0,0 +1,6 @@ +" Dummy test provider, missing this required variable: +" let g:loaded_brokenenabled_provider = 0 + +function! provider#python3#Call(method, args) + return 42 +endfunction diff --git a/test/functional/provider/provider_spec.lua b/test/functional/provider/provider_spec.lua index 78bc4a4edb..3895b8613f 100644 --- a/test/functional/provider/provider_spec.lua +++ b/test/functional/provider/provider_spec.lua @@ -14,8 +14,8 @@ describe('providers', function() command('set loadplugins') -- Using test-fixture with broken impl: -- test/functional/fixtures/autoload/provider/python.vim - eq('Vim:provider: python: missing required variable g:loaded_python_provider', - pcall_err(eval, "has('python')")) + eq('Vim:provider: python3: missing required variable g:loaded_python3_provider', + pcall_err(eval, "has('python3')")) end) it('with g:loaded_xx_provider, missing #Call()', function() -- cgit