To: vim_dev@googlegroups.com Subject: Patch 8.2.4209 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4209 Problem: partial in 'opfunc' cannot use an imported function. Solution: Also expand the function name in a partial. (closes #9614) Files: src/evalvars.c, src/testdir/test_vim9_import.vim *** ../vim-8.2.4208/src/evalvars.c 2022-01-23 17:59:01.226173123 +0000 --- src/evalvars.c 2022-01-24 21:25:27.774910378 +0000 *************** *** 4680,4706 **** void expand_autload_callback(callback_T *cb) { char_u *p; imported_T *import; ! if (!in_vim9script() || cb->cb_name == NULL || !cb->cb_free_name) return; ! p = vim_strchr(cb->cb_name, '.'); if (p == NULL) return; ! import = find_imported(cb->cb_name, p - cb->cb_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); ! if (name != NULL) { ! vim_free(cb->cb_name); ! cb->cb_name = name; } } } --- 4680,4723 ---- 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 ! && (cb->cb_partial == NULL || cb->cb_partial->pt_name == NULL))) return; ! 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(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 *newname = concat_str(si->sn_autoload_prefix, p + 1); ! if (newname != NULL) { ! 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; ! } } } } *** ../vim-8.2.4208/src/testdir/test_vim9_import.vim 2022-01-24 13:54:42.298380706 +0000 --- src/testdir/test_vim9_import.vim 2022-01-24 21:23:57.592606625 +0000 *************** *** 673,678 **** --- 673,711 ---- &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 TheFunc() + def TheFunc(): string + &operatorfunc = function('opfunc.Opfunc', [0]) + return 'g@' + enddef + feedkeys("\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 *** ../vim-8.2.4208/src/version.c 2022-01-24 20:00:51.903507264 +0000 --- src/version.c 2022-01-24 21:15:18.710273581 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4209, /**/ -- How do you know when you have run out of invisible ink? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///