diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-04-17 16:38:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-04-17 16:38:50 +0200 |
| commit | 6c7cc347af4f4bc1bf180d80ef81413f89e78f56 (patch) | |
| tree | bf7ac5b7612675e6f6bebc4f1c810fadebddff90 | |
| parent | 56994d215815139207f3c5ce02a1720e44e93c09 (diff) | |
| download | vim-git-6c7cc347af4f4bc1bf180d80ef81413f89e78f56.tar.gz | |
patch 8.2.2774: Vim9: cannot import an existing name even when using "as"v8.2.2774
Problem: Vim9: cannot import an existing name even when using "as".
Solution: Do not check for an existing name when using "as". (closes #8113)
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9script.c | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index d9ae4ff67..2f2fc9cc0 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1280,6 +1280,8 @@ def Test_import_as() var import_lines =<< trim END vim9script + var one = 'notused' + var yes = 777 import one as thatOne from './XexportAs' assert_equal(1, thatOne) import yes as yesYes from './XexportAs' diff --git a/src/version.c b/src/version.c index 113ba8ff0..5d26348ad 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2774, +/**/ 2773, /**/ 2772, diff --git a/src/vim9script.c b/src/vim9script.c index 796b7d13c..583a8d4c5 100644 --- a/src/vim9script.c +++ b/src/vim9script.c @@ -600,7 +600,8 @@ handle_import( } else { - if (check_defined(name, len, cctx, FALSE) == FAIL) + if (as_name == NULL + && check_defined(name, len, cctx, FALSE) == FAIL) goto erret; imported = new_imported(gap != NULL ? gap |