Mercurial > vim
changeset 35148:0ef2499e9812 v9.1.0403
patch 9.1.0403: Vim9: not able to import file from start dir
Commit: https://github.com/vim/vim/commit/8c35c26c1f68950a75a1a93339410244fec23afc
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Fri May 10 13:10:54 2024 +0200
patch 9.1.0403: Vim9: not able to import file from start dir
Problem: Vim9: not able to import file from start dir
(Danielle McLean)
Solution: Allow to import from start directory
(Yegappan Lakshmanan)
fixes: #13313
closes: #14740
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 10 May 2024 13:15:13 +0200 |
parents | ab349ffb7881 |
children | 7720516ffcea |
files | src/scriptfile.c src/testdir/test_vim9_import.vim src/version.c |
diffstat | 3 files changed, 31 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/scriptfile.c +++ b/src/scriptfile.c @@ -682,7 +682,7 @@ find_script_in_rtp(char_u *name) { int sid = -1; - (void)do_in_path_and_pp(p_rtp, name, DIP_NOAFTER, + (void)do_in_path_and_pp(p_rtp, name, DIP_START | DIP_NOAFTER, find_script_callback, &sid); return sid; }
--- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -3283,4 +3283,32 @@ def Test_set_imported_class_member() v9.CheckScriptSuccess(lines) enddef +" Test for using an imported function from the vimrc file. The function is +" defined in the 'start' directory of a package. +def Test_import_from_vimrc() + mkdir('Ximport/pack/foobar/start/foo/autoload', 'pR') + var lines =<< trim END + vim9script + export def Foo() + writefile(['Foo called'], 'Xoutput.log') + enddef + END + writefile(lines, 'Ximport/pack/foobar/start/foo/autoload/foo.vim') + lines =<< trim END + vim9script + set packpath+=./Ximport + try + import autoload 'foo.vim' + foo.Foo() + catch + writefile(['Failed to import foo.vim'], 'Xoutput.log') + endtry + qall! + END + writefile(lines, 'Xvimrc', 'D') + g:RunVim([], [], '-u Xvimrc') + assert_equal(['Foo called'], readfile('Xoutput.log')) + delete('Xoutput.log') +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker