aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-15 23:23:38 -04:00
Code

patch 8.2.4209: partial in 'opfunc' cannot use an imported function

Browse Source 
Problem:    partial in 'opfunc' cannot use an imported function.
Solution:   Also expand the function name in a partial. (closes #9614)
This commit is contained in:
Bram Moolenaar 2022-01-24 21:28:01 +00:00
parent dff97e65eb
commit 3e93a2b075
3 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/evalvars.c
View File

@ -4680,27 +4680,44 @@ copy_callback(callback_T *dest, callback_T *src)
void
expand_autload_callback(callback_T *cb)
{
char_u *name;
char_u *p;
imported_T *import;
if (!in_vim9script() || cb->cb_name == NULL || !cb->cb_free_name)
if (!in_vim9script() || cb->cb_name == NULL
|| (!cb->cb_free_name
&& (cb->cb_partial == NULL || cb->cb_partial->pt_name == NULL)))
return;
p = vim_strchr(cb->cb_name, '.');
if (cb->cb_partial != NULL)
name = cb->cb_partial->pt_name;
else
name = cb->cb_name;
p = vim_strchr(name, '.');
if (p == NULL)
return;
import = find_imported(cb->cb_name, p - cb->cb_name, FALSE, NULL);
import = find_imported(name, p - name, FALSE, NULL);
if (import != NULL && SCRIPT_ID_VALID(import->imp_sid))
{
scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
if (si->sn_autoload_prefix != NULL)
{
char_u *name = concat_str(si->sn_autoload_prefix, p + 1);
char_u *newname = concat_str(si->sn_autoload_prefix, p + 1);
if (name != NULL)
if (newname != NULL)
{
vim_free(cb->cb_name);
cb->cb_name = name;
if (cb->cb_partial != NULL)
{
if (cb->cb_name == cb->cb_partial->pt_name)
cb->cb_name = newname;
vim_free(cb->cb_partial->pt_name);
cb->cb_partial->pt_name = newname;
}
else
{
vim_free(cb->cb_name);
cb->cb_name = newname;
}
}
}
}

33
src/testdir/test_vim9_import.vim
View File

@ -673,6 +673,39 @@ def Test_use_autoload_import_in_insert_completion()
&rtp = save_rtp
enddef
def Test_use_autoload_import_partial_in_opfunc()
mkdir('Xdir/autoload', 'p')
var save_rtp = &rtp
exe 'set rtp^=' .. getcwd() .. '/Xdir'
var lines =<< trim END
vim9script
export def Opfunc(..._)
g:opfunc_called = 'yes'
enddef
END
writefile(lines, 'Xdir/autoload/opfunc.vim')
new
lines =<< trim END
vim9script
import autoload 'opfunc.vim'
nnoremap <expr> <F3> TheFunc()
def TheFunc(): string
&operatorfunc = function('opfunc.Opfunc', [0])
return 'g@'
enddef
feedkeys("\<F3>l", 'xt')
assert_equal('yes', g:opfunc_called)
END
CheckScriptSuccess(lines)
set opfunc=
bwipe!
delete('Xdir', 'rf')
&rtp = save_rtp
enddef
def Test_use_autoload_import_in_fold_expression()
mkdir('Xdir/autoload', 'p')
var save_rtp = &rtp

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4209,
/**/
4208,
/**/