kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(eval): make has('pythonx') work properly (#27739)

Browse Source 
Problem:  has('pythonx') always returns 1.
Solution: Make it the same as has('python3').
This commit is contained in:
zeertzjq 2024-03-05 15:54:41 +08:00 committed by GitHub
parent 0ffc926499
commit 5b312cd5f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval/funcs.c
View File

@ -3315,7 +3315,6 @@ static void f_has(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
"path_extra", "path_extra",
"persistent_undo", "persistent_undo",
"profile", "profile",
"pythonx",
"reltime", "reltime",
"quickfix", "quickfix",
"rightleft", "rightleft",
@ -3406,6 +3405,8 @@ static void f_has(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
n = syntax_present(curwin); n = syntax_present(curwin);
} else if (STRICMP(name, "clipboard_working") == 0) { } else if (STRICMP(name, "clipboard_working") == 0) {
n = eval_has_provider("clipboard"); n = eval_has_provider("clipboard");
} else if (STRICMP(name, "pythonx") == 0) {
n = eval_has_provider("python3");
} else if (STRICMP(name, "wsl") == 0) { } else if (STRICMP(name, "wsl") == 0) {
n = has_wsl(); n = has_wsl();
#ifdef UNIX #ifdef UNIX

7
test/functional/provider/python3_spec.lua
View File

@ -20,6 +20,12 @@ do
matches(expected, pcall_err(command, 'py3 print("foo")')) matches(expected, pcall_err(command, 'py3 print("foo")'))
matches(expected, pcall_err(command, 'py3file foo')) matches(expected, pcall_err(command, 'py3file foo'))
end) end)
it('feature test when Python 3 provider is missing', function()
eq(0, eval('has("python3")'))
eq(0, eval('has("python3_compiled")'))
eq(0, eval('has("python3_dynamic")'))
eq(0, eval('has("pythonx")'))
end)
pending( pending(
string.format('Python 3 (or the pynvim module) is broken/missing (%s)', reason), string.format('Python 3 (or the pynvim module) is broken/missing (%s)', reason),
function() end function() end
@ -38,6 +44,7 @@ describe('python3 provider', function()
eq(1, eval('has("python3")')) eq(1, eval('has("python3")'))
eq(1, eval('has("python3_compiled")')) eq(1, eval('has("python3_compiled")'))
eq(1, eval('has("python3_dynamic")')) eq(1, eval('has("python3_dynamic")'))
eq(1, eval('has("pythonx")'))
eq(0, eval('has("python3_dynamic_")')) eq(0, eval('has("python3_dynamic_")'))
eq(0, eval('has("python3_")')) eq(0, eval('has("python3_")'))
end) end)