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.

diff --git a/src/errors.h b/src/errors.h
index 7ad1076dfc7018258ad9b15ee374985afbf99c52..3fd265f43d850953a4ccda53e0bd8b5fdff77ca3 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -2966,8 +2966,7 @@ EXTERN char e_argument_name_shadows_existing_variable_str[]
        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[]

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

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index b15d411c87c28a0e03fc9cdb112e9986961be3fd..bacba2e8bf00dfcfe8c9df587fdf64708d6361e7 100644 (file)
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -429,6 +429,19 @@ def Test_import_fails()
       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

diff --git a/src/version.c b/src/version.c
index eaeb0a1c3701e239b338fc13b2e260beb8a9394a..27ee162fcf1a01bb9b0fd792de874ce555555089 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4167,
 /**/
     4166,
 /**/