From 1433ac93eb3acf28c55f0c4d775716ebee543160 Mon Sep 17 00:00:00 2001 From: Ernie Rael Date: Wed, 17 Apr 2024 22:36:32 +0200 Subject: patch 9.1.0346: Patch v9.1.0338 fixed sourcing a script with import Problem: Patch v9.1.0338 fixed sourcing a script with import Solution: Add test `import './file.vim' and verify it works with `:source` so it does not regress (Ernie Rael) closes: #14577 Signed-off-by: Ernie Rael Signed-off-by: Christian Brabandt --- src/testdir/test_vim9_import.vim | 25 +++++++++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 27 insertions(+) diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim index 156b035d48..968bce08b9 100644 --- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -1140,6 +1140,31 @@ def Test_autoload_import_relative() v9.CheckScriptFailure(lines, 'E484:') enddef +def Test_autoload_import_relative_compiled() + # autoload relative, access from compiled function. #14565 + var lines =<< trim END + vim9script + + export def F1(): string + return 'InFile.vim' + enddef + END + writefile(lines, 'xfile.vim', 'D') + lines =<< trim END + vim9script + + import autoload './xfile.vim' + + def F(): string + return xfile.F1() + enddef + assert_equal('InFile.vim', F()) + END + new + setline(1, lines) + :source +enddef + def Test_autoload_import_relative_autoload_dir() mkdir('autoload', 'pR') var lines =<< trim END diff --git a/src/version.c b/src/version.c index e79bea470a..490d4ad7f4 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 346, /**/ 345, /**/ -- cgit v1.2.3