commit db38552dcdc7460459df8bf5cf02666256045308
author h-east <h.east.727@gmail.com> Thu Sep 28 22:18:19 2023 +0200
committer Christian Brabandt <cb@256bit.org> Thu Sep 28 22:18:19 2023 +0200
tree 79c3631e1c83ad547356bea130ac9e247216dc87
parent 03ca4002c1dcd34c4b17fe4a491b02d77ec2c887

patch 9.0.1948: Vim9: object variable "this." should only be used in constructor

Problem:  Vim9: object variable "this." should only be used in
          constructor
Solution: Disallow to this in normal object methods (other than
          constructors)

closes: #13152
closes: #13212

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: h-east <h.east.727@gmail.com>

src/errors.h

diff --git a/src/errors.h b/src/errors.h
index 7260c30..baf36d5 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3529,6 +3529,8 @@
 	INIT(= N_("E1388: Public keyword not supported for a method"));
 EXTERN char e_missing_name_after_implements[]
 	INIT(= N_("E1389: Missing name after implements"));
+EXTERN char e_cannot_use_an_object_variable_except_with_the_new_method_str[]
+	INIT(= N_("E1390: Cannot use an object variable \"this.%s\" except with the \"new\" method"));
 #endif
 EXTERN char e_cannot_mix_positional_and_non_positional_str[]
 	INIT(= N_("E1400: Cannot mix positional and non-positional arguments: %s"));
@@ -3544,4 +3546,4 @@
 	INIT(= N_("E1405: Invalid format specifier: %s"));
 EXTERN char e_aptypes_is_null_nr_str[]
 	INIT(= "E1408: Internal error: ap_types or ap_types[idx] is NULL: %d: %s");
-// E1390 - E1399 unused
+// E1391 - E1399 unused

src/testdir/test_vim9_class.vim

diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index 2fd66c9..c272aab 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -956,6 +956,17 @@
   v9.CheckSourceFailure(lines, 'E1013:')
 
   lines =<< trim END
+    vim9script
+
+    class C
+      this.str: string
+      def MethodA(this.str)
+      enddef
+    endclass
+  END
+  v9.CheckSourceFailure(lines, 'E1390: Cannot use an object variable "this.str" except with the "new" method')
+
+  lines =<< trim END
       vim9script
 
       class C

src/userfunc.c

diff --git a/src/userfunc.c b/src/userfunc.c
index e0c1d5f..0f487fc 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -320,6 +320,16 @@
 		++p;
 	    char_u *argend = p;
 
+	    // object variable this. can be used only in a constructor
+	    if (STRNCMP(eap->arg, "new", 3) != 0)
+	    {
+		c = *argend;
+		*argend = NUL;
+		semsg(_(e_cannot_use_an_object_variable_except_with_the_new_method_str), arg);
+		*argend = c;
+		break;
+	    }
+
 	    if (*skipwhite(p) == '=')
 	    {
 		char_u *defval = skipwhite(skipwhite(p) + 1);

src/version.c

diff --git a/src/version.c b/src/version.c
index fb1b307..49b4067 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1948,
+/**/
     1947,
 /**/
     1946,