commit dd5893be34649482ed62525430fb8baa1ec273ce
author Bram Moolenaar <Bram@vim.org> Thu Jan 20 21:32:54 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Thu Jan 20 21:32:54 2022 +0000
tree b53ae04f33ac4c243c48a4650947d0792aa91c6c
parent e615db06046312e74886fa1ef98feb5a9db2a7c3

patch 8.2.4167: Vim9: error message for old style import

Problem:    Vim9: error message for old style import.
Solution:   Use another error message.  Add a test.

src/errors.h

diff --git a/src/errors.h b/src/errors.h
index 7ad1076..3fd265f 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -2966,8 +2966,7 @@
 	INIT(= N_("E1167: Argument name shadows existing variable: %s"));
 EXTERN char e_argument_already_declared_in_script_str[]
 	INIT(= N_("E1168: Argument already declared in the script: %s"));
-EXTERN char e_import_as_name_not_supported_here[]
-	INIT(= N_("E1169: 'import * as {name}' not supported here"));
+// E1169 unused
 EXTERN char e_cannot_use_hash_curly_to_start_comment[]
 	INIT(= N_("E1170: Cannot use #{ to start a comment"));
 EXTERN char e_missing_end_block[]

src/evalvars.c

diff --git a/src/evalvars.c b/src/evalvars.c
index 15999bc..ca7e7e8 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2711,7 +2711,7 @@
 		else
 		{
 		    if (flags & EVAL_VAR_VERBOSE)
-			emsg(_(e_import_as_name_not_supported_here));
+			semsg(_(e_expected_dot_after_name_str), name);
 		    ret = FAIL;
 		}
 	    }

src/testdir/test_vim9_import.vim

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index b15d411..bacba2e 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -429,6 +429,19 @@
       var that = foo
   END
   CheckScriptFailure(lines, 'E1060: Expected dot after name: foo')
+  lines =<< trim END
+      vim9script
+      import './Xfoo.vim' as foo
+      var that: any
+      that += foo
+  END
+  CheckScriptFailure(lines, 'E1060: Expected dot after name: foo')
+  lines =<< trim END
+      vim9script
+      import './Xfoo.vim' as foo
+      foo += 9
+  END
+  CheckScriptFailure(lines, 'E1060: Expected dot after name: foo')
 
   lines =<< trim END
       vim9script

src/version.c

diff --git a/src/version.c b/src/version.c
index eaeb0a1..27ee162 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4167,
+/**/
     4166,
 /**/
     4165,