vim: src/testdir/test_vim9_class.vim comparison

comparison src/testdir/test_vim9_class.vim @ 33942:3bba09502b8d v9.0.2167

patch 9.0.2167: Vim9: not consistently using :var for declarations Commit: https://github.com/vim/vim/commit/74da0ee0a24799a312a3a8a65858237185ef7a23 Author: Doug Kearns <dougkearns@gmail.com> Date: Thu Dec 14 20:26:26 2023 +0100 patch 9.0.2167: Vim9: not consistently using :var for declarations Problem: Vim9-script object/class variable declarations use syntax that is inconsistent with the rest of the language. Solution: Use :var to declare object and class variables. closes: #13670 Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>

author	Christian Brabandt <cb@256bit.org>
date	Thu, 14 Dec 2023 20:30:06 +0100
parents	bdd408288d95
children	45a50fd59a73

comparison

equal deleted inserted replaced

-:8845f55a6c20
+:3bba09502b8d
 class Something
 endclass | echo 'done'
 END
 v9.CheckSourceFailure(lines, "E488: Trailing characters: | echo 'done'", 3)
+# Use old "this." prefixed member variable declaration syntax (without intialization)
+lines =<< trim END
+vim9script
+class Something
+this.count: number
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this.count: number', 3)
+# Use old "this." prefixed member variable declaration syntax (with intialization)
+lines =<< trim END
+vim9script
+class Something
+this.count: number = 42
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this.count: number = 42', 3)
+# Use old "this." prefixed member variable declaration syntax (type inferred)
+lines =<< trim END
+vim9script
+class Something
+this.count = 42
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this.count = 42', 3)
 # Use "this" without any member variable name
 lines =<< trim END
 vim9script
 class Something
 this
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: this', 3)
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this', 3)
 # Use "this." without any member variable name
 lines =<< trim END
 vim9script
 class Something
 this.
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: this.', 3)
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this.', 3)
 # Space between "this" and ".<variable>"
 lines =<< trim END
 vim9script
 class Something
 this .count
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: this .count', 3)
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this .count', 3)
 # Space between "this." and the member variable name
 lines =<< trim END
 vim9script
 class Something
 this. count
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: this. count', 3)
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: this. count', 3)
 # Use "that" instead of "this"
 lines =<< trim END
 vim9script
 class Something
-this.count: number
+var count: number
 that.count
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: that.count', 4)
-# Member variable without a type or initialization
+# Use "variable" instead of "var" for member variable declaration (without initialization)
 lines =<< trim END
 vim9script
 class Something
-this.count
+variable count: number
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1022: Type or initialization required', 3)
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: variable count: number', 3)
+# Use "variable" instead of "var" for member variable declaration (with initialization)
+lines =<< trim END
+vim9script
+class Something
+variable count: number = 42
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: variable count: number = 42', 3)
+# Use "variable" instead of "var" for member variable declaration (type inferred)
+lines =<< trim END
+vim9script
+class Something
+variable count = 42
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1318: Not a valid command in a class: variable count = 42', 3)
 # Use a non-existing member variable in new()
 lines =<< trim END
 vim9script
 class Something
 # Space before ":" in a member variable declaration
 lines =<< trim END
 vim9script
 class Something
-this.count : number
+var count : number
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1059: No white space allowed before colon: count : number', 3)
 # No space after ":" in a member variable declaration
 lines =<< trim END
 vim9script
 class Something
-this.count:number
+var count:number
 endclass
 END
 v9.CheckSourceFailure(lines, "E1069: White space required after ':'", 3)
+# Missing ":var" in a "var" member variable declaration (without initialization)
+lines =<< trim END
+vim9script
+class Something
+var: number
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: var: number', 3)
+# Missing ":var" in a "var" member variable declaration (with initialization)
+lines =<< trim END
+vim9script
+class Something
+var: number = 42
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: var: number = 42', 3)
+# Missing ":var" in a "var" member variable declaration (type inferred)
+lines =<< trim END
+vim9script
+class Something
+var = 42
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1317: Invalid object variable declaration: var = 42', 3)
 # Test for unsupported comment specifier
 lines =<< trim END
 vim9script
 class Something
 # method.  Check for using type() and typename() with a class and an object.
 lines =<< trim END
 vim9script
 class TextPosition
-this.lnum: number
+var lnum: number
-this.col: number
+var col: number
 # make a nicely formatted string
 def ToString(): string
 return $'({this.lnum}, {this.col})'
 enddef
 # Use a multi-line initialization for a member variable
 lines =<< trim END
 vim9script
 class A
-this.y = {
+var y = {
 X: 1
 }
 endclass
 var a = A.new()
 END
 class A
 public def Foo()
 enddef
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1331: Public must be followed by "this" or "static"', 3)
+v9.CheckSourceFailure(lines, 'E1331: Public must be followed by "var" or "static"', 3)
 # Using the "public" keyword when defining a class method
 lines =<< trim END
 vim9script
 class A
 class A
 public def _Foo()
 enddef
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1331: Public must be followed by "this" or "static"', 3)
+v9.CheckSourceFailure(lines, 'E1331: Public must be followed by "var" or "static"', 3)
 # Using the "public" keyword when defining a class protected method
 lines =<< trim END
 vim9script
 class A
 def Test_class_interface_wrong_end()
 var lines =<< trim END
 vim9script
 abstract class SomeName
-this.member = 'text'
+var member = 'text'
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E476: Invalid command: endinterface, expected endclass', 4)
 lines =<< trim END
 vim9script
 export interface AnotherName
-this.member: string
+var member: string
 endclass
 END
 v9.CheckSourceFailure(lines, 'E476: Invalid command: endclass, expected endinterface', 4)
 enddef
 # Use an uninitialized object in script context
 var lines =<< trim END
 vim9script
 class State
-this.value = 'xyz'
+var value = 'xyz'
 endclass
 var state: State
 var db = {'xyz': 789}
 echo db[state.value]
 # Use an uninitialized object from a def function
 lines =<< trim END
 vim9script
 class Class
-this.id: string
+var id: string
 def Method1()
 echo 'Method1' .. this.id
 enddef
 endclass
 # object method.
 lines =<< trim END
 vim9script
 class Background
-this.background = 'dark'
+var background = 'dark'
 endclass
 class Colorscheme
-this._bg: Background
+var _bg: Background
 def GetBackground(): string
 return this._bg.background
 enddef
 endclass
 # TODO: this should not give an error but be handled at runtime
 lines =<< trim END
 vim9script
 class Class
-this.id: string
+var id: string
 def Method1()
 echo 'Method1' .. this.id
 enddef
 endclass
 def Test_class_member_initializer()
 var lines =<< trim END
 vim9script
 class TextPosition
-this.lnum: number = 1
+var lnum: number = 1
-this.col: number = 1
+var col: number = 1
 # constructor with only the line number
 def new(lnum: number)
 this.lnum = lnum
 enddef
 def Test_member_any_used_as_object()
 var lines =<< trim END
 vim9script
 class Inner
-this.value: number = 0
+var value: number = 0
 endclass
 class Outer
-this.inner: any
+var inner: any
 endclass
 def F(outer: Outer)
 outer.inner.value = 1
 enddef
 # Try modifying a protected variable using an "any" object
 lines =<< trim END
 vim9script
 class Inner
-this._value: string = ''
+var _value: string = ''
 endclass
 class Outer
-this.inner: any
+var inner: any
 endclass
 def F(outer: Outer)
 outer.inner._value = 'b'
 enddef
 # Try modifying a non-existing variable using an "any" object
 lines =<< trim END
 vim9script
 class Inner
-this.value: string = ''
+var value: string = ''
 endclass
 class Outer
-this.inner: any
+var inner: any
 endclass
 def F(outer: Outer)
 outer.inner.someval = 'b'
 enddef
 def Test_assignment_nested_type()
 var lines =<< trim END
 vim9script
 class Inner
-public this.value: number = 0
+public var value: number = 0
 endclass
 class Outer
-this.inner: Inner
+var inner: Inner
 endclass
 def F(outer: Outer)
 outer.inner.value = 1
 enddef
 # Assignment where target item is read only in :def
 lines =<< trim END
 vim9script
 class Inner
-this.value: number = 0
+var value: number = 0
 endclass
 class Outer
-this.inner: Inner
+var inner: Inner
 endclass
 def F(outer: Outer)
 outer.inner.value = 1
 enddef
 # Assignment where target item is read only script level
 lines =<< trim END
 vim9script
 class Inner
-this.value: number = 0
+var value: number = 0
 endclass
 class Outer
-this.inner: Inner
+var inner: Inner
 endclass
 def F(outer: Outer)
 outer.inner.value = 1
 enddef
 # Use "+=" to assign to a object variable
 var lines =<< trim END
 vim9script
 class Foo
-public this.x: number
+public var x: number
 def Add(n: number)
 this.x += n
 enddef
 endclass
 def Test_expr_after_using_object()
 var lines =<< trim END
 vim9script
 class Something
-this.label: string = ''
+var label: string = ''
 endclass
 def Foo(): Something
 var v = Something.new()
 echo 'in Foo(): ' .. typename(v)
 def Test_class_default_new()
 var lines =<< trim END
 vim9script
 class TextPosition
-this.lnum: number = 1
+var lnum: number = 1
-this.col: number = 1
+var col: number = 1
 endclass
 var pos = TextPosition.new()
 assert_equal(1, pos.lnum)
 assert_equal(1, pos.col)
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class Person
-this.name: string
+var name: string
-this.age: number = 42
+var age: number = 42
-this.education: string = "unknown"
+var education: string = "unknown"
 def new(this.name, this.age = v:none, this.education = v:none)
 enddef
 endclass
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class Person
-this.name: string
+var name: string
-this.age: number = 42
+var age: number = 42
-this.education: string = "unknown"
+var education: string = "unknown"
 def new(this.name, this.age = v:none, this.education = v:none)
 enddef
 endclass
 # Using a specific value to initialize an instance variable in the new()
 # method.
 lines =<< trim END
 vim9script
 class A
-this.val: string
+var val: string
 def new(this.val = 'a')
 enddef
 endclass
 END
 v9.CheckSourceFailure(lines, "E1328: Constructor default value must be v:none:  = 'a'", 4)
 def Test_class_new_with_object_member()
 var lines =<< trim END
 vim9script
 class C
-this.str: string
+var str: string
-this.num: number
+var num: number
 def new(this.str, this.num)
 enddef
 def newVals(this.str, this.num)
 enddef
 endclass
 lines =<< trim END
 vim9script
 class C
-this.str: string
+var str: string
-this.num: number
+var num: number
 def new(this.str, this.num)
 enddef
 endclass
 def Check()
 lines =<< trim END
 vim9script
 class C
-this.str: string
+var str: string
-this.num: number
+var num: number
 def newVals(this.str, this.num)
 enddef
 endclass
 def Check()
 lines =<< trim END
 vim9script
 class C
-this.str: string
+var str: string
 def new(str: any)
 enddef
 endclass
 def Check()
 # Try using "this." argument in a class method
 lines =<< trim END
 vim9script
 class A
-this.val = 10
+var val = 10
 static def Foo(this.val: number)
 enddef
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1390: Cannot use an object variable "this.val" except with the "new" method', 4)
 # Try using "this." argument in an object method
 lines =<< trim END
 vim9script
 class A
-this.val = 10
+var val = 10
 def Foo(this.val: number)
 enddef
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1390: Cannot use an object variable "this.val" except with the "new" method', 4)
 def Test_class_object_member_inits()
 var lines =<< trim END
 vim9script
 class TextPosition
-this.lnum: number
+var lnum: number
-this.col = 1
+var col = 1
-this.addcol: number = 2
+var addcol: number = 2
 endclass
 var pos = TextPosition.new()
 assert_equal(0, pos.lnum)
 assert_equal(1, pos.col)
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class TextPosition
-this.lnum
+var lnum
-this.col = 1
+var col = 1
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1022: Type or initialization required', 3)
 # If the type is not specified for a member, then it should be set during
 init_count += 1
 return 'foo'
 enddef
 class A
-this.str1 = Init()
+var str1 = Init()
-this.str2: string = Init()
+var str2: string = Init()
-this.col = 1
+var col = 1
 endclass
 assert_equal(init_count, 0)
 var a = A.new()
 assert_equal(init_count, 2)
 # Test for initializing an object member with an unknown variable/type
 lines =<< trim END
 vim9script
 class A
-this.value = init_val
+var value = init_val
 endclass
 var a = A.new()
 END
 v9.CheckSourceFailure(lines, 'E1001: Variable not found: init_val', 1)
 # Test for initializing an object member with an special type
 lines =<< trim END
 vim9script
 class A
-this.value: void
+var value: void
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1330: Invalid type for object variable: void', 3)
 enddef
 " Test for instance variable access
 def Test_instance_variable_access()
 var lines =<< trim END
 vim9script
 class Triple
-this._one = 1
+var _one = 1
-this.two = 2
+var two = 2
-public this.three = 3
+public var three = 3
 def GetOne(): number
 return this._one
 enddef
 endclass
 # Test for a public member variable name beginning with an underscore
 lines =<< trim END
 vim9script
 class A
-public this._val = 10
+public var _val = 10
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1332: Public variable name cannot start with underscore: public this._val = 10', 3)
+v9.CheckSourceFailure(lines, 'E1332: Public variable name cannot start with underscore: public var _val = 10', 3)
 lines =<< trim END
 vim9script
 class MyCar
-this.make: string
+var make: string
-this.age = 5
+var age = 5
 def new(make_arg: string)
 this.make = make_arg
 enddef
 lines =<< trim END
 vim9script
 class MyCar
-this.make: string
+var make: string
 def new(make_arg: string)
 this.make = make_arg
 enddef
 endclass
 lines =<< trim END
 vim9script
 class Foo
-this.x: list<number> = []
+var x: list<number> = []
 def Add(n: number): any
 this.x->add(n)
 return this
 enddef
 # Test for "public" cannot be abbreviated
 lines =<< trim END
 vim9script
 class Something
-pub this.val = 1
+pub var val = 1
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1065: Command cannot be shortened: pub this.val = 1', 3)
+v9.CheckSourceFailure(lines, 'E1065: Command cannot be shortened: pub var val = 1', 3)
-# Test for "public" keyword must be followed by "this" or "static".
+# Test for "public" keyword must be followed by "var" or "static".
 lines =<< trim END
 vim9script
 class Something
 public val = 1
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1331: Public must be followed by "this" or "static"', 3)
+v9.CheckSourceFailure(lines, 'E1331: Public must be followed by "var" or "static"', 3)
 # Modify a instance variable using the class name in the script context
 lines =<< trim END
 vim9script
 class A
-public this.val = 1
+public var val = 1
 endclass
 A.val = 1
 END
 v9.CheckSourceFailure(lines, 'E1376: Object variable "val" accessible only using class "A" object', 5)
 # Read a instance variable using the class name in the script context
 lines =<< trim END
 vim9script
 class A
-public this.val = 1
+public var val = 1
 endclass
 var i = A.val
 END
 v9.CheckSourceFailure(lines, 'E1376: Object variable "val" accessible only using class "A" object', 5)
 # Modify a instance variable using the class name in a def function
 lines =<< trim END
 vim9script
 class A
-public this.val = 1
+public var val = 1
 endclass
 def T()
 A.val = 1
 enddef
 T()
 # Read a instance variable using the class name in a def function
 lines =<< trim END
 vim9script
 class A
-public this.val = 1
+public var val = 1
 endclass
 def T()
 var i = A.val
 enddef
 T()
 # Access from child class extending a class:
 lines =<< trim END
 vim9script
 class A
-this.ro_obj_var = 10
+var ro_obj_var = 10
-public this.rw_obj_var = 20
+public var rw_obj_var = 20
-this._priv_obj_var = 30
+var _priv_obj_var = 30
 endclass
 class B extends A
 def Foo()
 var x: number
 def Test_class_variable_access()
 # Test for "static" cannot be abbreviated
 var lines =<< trim END
 vim9script
 class Something
-stat this.val = 1
+stat var val = 1
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1065: Command cannot be shortened: stat this.val = 1', 3)
+v9.CheckSourceFailure(lines, 'E1065: Command cannot be shortened: stat var val = 1', 3)
-# Test for "static" cannot be followed by "this".
+# Test for "static" cannot be followed by "public".
 lines =<< trim END
 vim9script
 class Something
-static this.val = 1
+static public var val = 1
 endclass
 END
-v9.CheckSourceFailure(lines, 'E1368: Static cannot be followed by "this" in a variable name', 3)
+v9.CheckSourceFailure(lines, 'E1368: Static must be followed by "var" or "def"', 3)
-# Test for "static" cannot be followed by "public".
-lines =<< trim END
-vim9script
-class Something
-static public val = 1
-endclass
-END
-v9.CheckSourceFailure(lines, 'E1022: Type or initialization required', 3)
 # A readonly class variable cannot be modified from a child class
 lines =<< trim END
 vim9script
 class A
-static ro_class_var = 40
+static var ro_class_var = 40
 endclass
 class B extends A
 def Foo()
 A.ro_class_var = 50
 # A protected class variable cannot be accessed from a child class
 lines =<< trim END
 vim9script
 class A
-static _priv_class_var = 60
+static var _priv_class_var = 60
 endclass
 class B extends A
 def Foo()
 var i = A._priv_class_var
 # A protected class variable cannot be modified from a child class
 lines =<< trim END
 vim9script
 class A
-static _priv_class_var = 60
+static var _priv_class_var = 60
 endclass
 class B extends A
 def Foo()
 A._priv_class_var = 0
 # Access from child class extending a class and from script context
 lines =<< trim END
 vim9script
 class A
-static ro_class_var = 10
+static var ro_class_var = 10
-public static rw_class_var = 20
+public static var rw_class_var = 20
-static _priv_class_var = 30
+static var _priv_class_var = 30
 endclass
 class B extends A
 def Foo()
 var x: number
 def Test_class_object_compare()
 var class_lines =<< trim END
 vim9script
 class Item
-this.nr = 0
+var nr = 0
-this.name = 'xx'
+var name = 'xx'
 endclass
 END
 # used at the script level and in a compiled function
 var test_lines =<< trim END
 def Test_object_type()
 var lines =<< trim END
 vim9script
 class One
-this.one = 1
+var one = 1
 endclass
 class Two
-this.two = 2
+var two = 2
 endclass
 class TwoMore extends Two
-this.more = 9
+var more = 9
 endclass
 var o: One = One.new()
 var t: Two = Two.new()
 var m: TwoMore = TwoMore.new()
 lines =<< trim END
 vim9script
 class One
-this.one = 1
+var one = 1
 endclass
 class Two
-this.two = 2
+var two = 2
 endclass
 var o: One = Two.new()
 END
 v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected object<One> but got object<Two>', 10)
 interface One
 def GetMember(): number
 endinterface
 class Two implements One
-this.one = 1
+var one = 1
 def GetMember(): number
 return this.one
 enddef
 endclass
 lines =<< trim END
 vim9script
 class Num
-this.n: number = 0
+var n: number = 0
 endclass
 def Ref(name: string): func(Num): Num
 return (arg: Num): Num => {
 return eval(name)(arg)
 def Test_class_member()
 # check access rules
 var lines =<< trim END
 vim9script
 class TextPos
-this.lnum = 1
+var lnum = 1
-this.col = 1
+var col = 1
-static counter = 0
+static var counter = 0
-static _secret = 7
+static var _secret = 7
-public static  anybody = 42
+public static var anybody = 42
 static def AddToCounter(nr: number)
 counter += nr
 enddef
 endclass
 # example in the help
 lines =<< trim END
 vim9script
 class OtherThing
-this.size: number
+var size: number
-static totalSize: number
+static var totalSize: number
 def new(this.size)
 totalSize += this.size
 enddef
 endclass
 # using static class member twice
 lines =<< trim END
 vim9script
 class HTML
-static author: string = 'John Doe'
+static var author: string = 'John Doe'
 static def MacroSubstitute(s: string): string
 return substitute(s, '{{author}}', author, 'gi')
 enddef
 endclass
 # access protected member in lambda
 lines =<< trim END
 vim9script
 class Foo
-this._x: number = 0
+var _x: number = 0
 def Add(n: number): number
 const F = (): number => this._x + n
 return F()
 enddef
 # access protected member in lambda body
 lines =<< trim END
 vim9script
 class Foo
-this._x: number = 6
+var _x: number = 6
 def Add(n: number): number
 var Lam = () => {
 this._x = this._x + n
 }
 # check shadowing
 lines =<< trim END
 vim9script
 class Some
-static count = 0
+static var count = 0
 def Method(count: number)
 echo count
 enddef
 endclass
 # Use a local variable in a method with the same name as a class variable
 lines =<< trim END
 vim9script
 class Some
-static count = 0
+static var count = 0
 def Method(arg: number)
 var count = 3
 echo arg count
 enddef
 endclass
 # Test for using an invalid type for a member variable
 lines =<< trim END
 vim9script
 class A
-this.val: xxx
+var val: xxx
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1010: Type not recognized: xxx', 3)
 # Test for setting a member on a null object
 lines =<< trim END
 vim9script
 class A
-public this.val: string
+public var val: string
 endclass
 def F()
 var obj: A
 obj.val = ""
 # Test for accessing a member on a null object
 lines =<< trim END
 vim9script
 class A
-this.val: string
+var val: string
 endclass
 def F()
 var obj: A
 echo obj.val
 # Test for setting a member on a null object, at script level
 lines =<< trim END
 vim9script
 class A
-public this.val: string
+public var val: string
 endclass
 var obj: A
 obj.val = ""
 END
 # Test for accessing a member on a null object, at script level
 lines =<< trim END
 vim9script
 class A
-this.val: string
+var val: string
 endclass
 var obj: A
 echo obj.val
 END
 # Test for no space before or after the '=' when initializing a member
 # variable
 lines =<< trim END
 vim9script
 class A
-this.val: number= 10
+var val: number= 10
 endclass
 END
 v9.CheckSourceFailure(lines, "E1004: White space required before and after '='", 3)
 lines =<< trim END
 vim9script
 class A
-this.val: number =10
+var val: number =10
 endclass
 END
 v9.CheckSourceFailure(lines, "E1004: White space required before and after '='", 3)
 # Access a non-existing member
 def Test_defining_class_message()
 var lines =<< trim END
 vim9script
 class Base
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 endclass
 class Child extends Base
 endclass
 v9.CheckSourceFailure(lines, 'E1333: Cannot access protected variable "_v1" in class "Base"', 11)
 lines =<< trim END
 vim9script
 class Base
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 endclass
 class Child extends Base
 endclass
 v9.CheckSourceFailure(lines, 'E1333: Cannot access protected variable "_v1" in class "Base"', 2)
 lines =<< trim END
 vim9script
 class Base
-this.v1: list<list<number>>
+var v1: list<list<number>>
 endclass
 class Child extends Base
 endclass
 v9.CheckSourceFailure(lines, 'E1335: Variable "v1" in class "Base" is not writable', 11)
 lines =<< trim END
 vim9script
 class Base
-this.v1: list<list<number>>
+var v1: list<list<number>>
 endclass
 class Child extends Base
 endclass
 class Base0
 endclass
 class Base extends Base0
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 endclass
 class Child extends Base
 endclass
 class Base extends Base0
 endclass
 class Child extends Base
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 endclass
 def F()
 var o = Child.new()
 var x = o._v1
 func Test_class_garbagecollect()
 let lines =<< trim END
 vim9script
 class Point
-this.p = [2, 3]
+var p = [2, 3]
-static pl = ['a', 'b']
+static var pl = ['a', 'b']
-static pd = {a: 'a', b: 'b'}
+static var pd = {a: 'a', b: 'b'}
 endclass
 echo Point.pl Point.pd
 call test_garbagecollect_now()
 echo Point.pl Point.pd
 interface View
 endinterface
 class Widget
-this.view: View
+var view: View
 endclass
 class MyView implements View
-this.widget: Widget
+var widget: Widget
 def new()
 # this will result in a circular reference to this object
-this.widget = Widget.new(this)
+var widget = Widget.new(this)
 enddef
 endclass
 var view = MyView.new()
 func Test_interface_garbagecollect()
 let lines =<< trim END
 vim9script
 interface I
-this.ro_obj_var: number
+var ro_obj_var: number
 def ObjFoo(): number
 endinterface
 class A implements I
-static ro_class_var: number = 10
+static var ro_class_var: number = 10
-public static rw_class_var: number = 20
+public static var rw_class_var: number = 20
-static _priv_class_var: number = 30
+static var _priv_class_var: number = 30
-this.ro_obj_var: number = 40
+var ro_obj_var: number = 40
-this._priv_obj_var: number = 60
+var _priv_obj_var: number = 60
 static def _ClassBar(): number
 return _priv_class_var
 enddef
 def Test_class_method()
 var lines =<< trim END
 vim9script
 class Value
-this.value = 0
+var value = 0
-static objects = 0
+static var objects = 0
 def new(v: number)
 this.value = v
 ++objects
 enddef
 # Test for calling a class method from another class method without the class
 # name prefix.
 lines =<< trim END
 vim9script
 class A
-static myList: list<number> = [1]
+static var myList: list<number> = [1]
 static def Foo(n: number)
 myList->add(n)
 enddef
 static def Bar()
 Foo(2)
 def Test_class_object_to_string()
 var lines =<< trim END
 vim9script
 class TextPosition
-this.lnum = 1
+var lnum = 1
-this.col = 22
+var col = 22
 endclass
 assert_equal("class TextPosition", string(TextPosition))
 var pos = TextPosition.new()
 def Test_interface_basics()
 var lines =<< trim END
 vim9script
 interface Something
-this.ro_var: list<number>
+var ro_var: list<number>
 def GetCount(): number
 endinterface
 END
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 interface SomethingWrong
-static count = 7
+static var count = 7
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1342: Interface can only be defined in Vim9 script', 1)
 lines =<< trim END
 vim9script
 interface Some
-this.value: number
+var value: number
 def Method(value: number)
 endinterface
 END
 # The argument name and the object member name are the same, but this is not a
 # problem because object members are always accessed with the "this." prefix.
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 interface somethingWrong
-static count = 7
+static var count = 7
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1343: Interface name must start with an uppercase letter: somethingWrong', 2)
 lines =<< trim END
 vim9script
 interface SomethingWrong
-this.value: string
+var value: string
-this.count = 7
+var count = 7
 def GetCount(): number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1344: Cannot initialize a variable in an interface', 4)
 lines =<< trim END
 vim9script
 interface SomethingWrong
-this.value: string
+var value: string
-this.count: number
+var count: number
 def GetCount(): number
 return 5
 enddef
 endinterface
 END
 def Test_class_implements_interface()
 var lines =<< trim END
 vim9script
 interface Some
-this.count: number
+var count: number
 def Method(nr: number)
 endinterface
 class SomeImpl implements Some
-this.count: number
+var count: number
 def Method(nr: number)
 echo nr
 enddef
 endclass
 interface Another
-this.member: string
+var member: string
 endinterface
 class AnotherImpl implements Some, Another
-this.member = 'abc'
+var member = 'abc'
-this.count = 20
+var count = 20
 def Method(nr: number)
 echo nr
 enddef
 endclass
 END
 lines =<< trim END
 vim9script
 interface Some
-this.count: number
+var count: number
 endinterface
 class SomeImpl implements Some implements Some
-this.count: number
+var count: number
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1350: Duplicate "implements"', 7)
 lines =<< trim END
 vim9script
 interface Some
-this.count: number
+var count: number
 endinterface
 class SomeImpl implements Some, Some
-this.count: number
+var count: number
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1351: Duplicate interface after "implements": Some', 7)
 lines =<< trim END
 vim9script
 interface Some
-this.counter: number
+var counter: number
 def Method(nr: number)
 endinterface
 class SomeImpl implements Some
-this.count: number
+var count: number
 def Method(nr: number)
 echo nr
 enddef
 endclass
 END
 lines =<< trim END
 vim9script
 interface Some
-this.count: number
+var count: number
 def Methods(nr: number)
 endinterface
 class SomeImpl implements Some
-this.count: number
+var count: number
 def Method(nr: number)
 echo nr
 enddef
 endclass
 END
 # Check different order of members in class and interface works.
 lines =<< trim END
 vim9script
 interface Result
-this.label: string
+var label: string
-this.errpos: number
+var errpos: number
 endinterface
 # order of members is opposite of interface
 class Failure implements Result
-public this.lnum: number = 5
+public var lnum: number = 5
-this.errpos: number = 42
+var errpos: number = 42
-this.label: string = 'label'
+var label: string = 'label'
 endclass
 def Test()
 var result: Result = Failure.new()
 # access superclass interface members from subclass, mix variable order
 lines =<< trim END
 vim9script
 interface I1
-this.mvar1: number
+var mvar1: number
-this.mvar2: number
+var mvar2: number
 endinterface
 # NOTE: the order is swapped
 class A implements I1
-this.mvar2: number
+var mvar2: number
-this.mvar1: number
+var mvar1: number
-public static svar2: number
+public static var svar2: number
-public static svar1: number
+public static var svar1: number
 def new()
 svar1 = 11
 svar2 = 12
 this.mvar1 = 111
 this.mvar2 = 112
 # Two interfaces, one on A, one on B; each has both kinds of variables
 lines =<< trim END
 vim9script
 interface I1
-this.mvar1: number
+var mvar1: number
-this.mvar2: number
+var mvar2: number
 endinterface
 interface I2
-this.mvar3: number
+var mvar3: number
-this.mvar4: number
+var mvar4: number
 endinterface
 class A implements I1
-public static svar1: number
+public static var svar1: number
-public static svar2: number
+public static var svar2: number
-this.mvar1: number
+var mvar1: number
-this.mvar2: number
+var mvar2: number
 def new()
 svar1 = 11
 svar2 = 12
 this.mvar1 = 111
 this.mvar2 = 112
 enddef
 endclass
 class B extends A implements I2
-static svar3: number
+static var svar3: number
-static svar4: number
+static var svar4: number
-this.mvar3: number
+var mvar3: number
-this.mvar4: number
+var mvar4: number
 def new()
 svar3 = 23
 svar4 = 24
 this.mvar1 = 121
 this.mvar2 = 122
 this.mvar4 = 124
 enddef
 endclass
 class C extends B
-public static svar5: number
+public static var svar5: number
 def new()
 svar5 = 1001
 this.mvar1 = 131
 this.mvar2 = 132
 this.mvar3 = 133
 def Test_class_used_as_type()
 var lines =<< trim END
 vim9script
 class Point
-this.x = 0
+var x = 0
-this.y = 0
+var y = 0
 endclass
 var p: Point
 p = Point.new(2, 33)
 assert_equal(2, p.x)
 lines =<< trim END
 vim9script
 interface HasX
-this.x: number
+var x: number
 endinterface
 class Point implements HasX
-this.x = 0
+var x = 0
-this.y = 0
+var y = 0
 endclass
 var p: Point
 p = Point.new(2, 33)
 var hx = p
 lines =<< trim END
 vim9script
 class Point
-this.x = 0
+var x = 0
-this.y = 0
+var y = 0
 endclass
 var p: Point
 p = 'text'
 END
 def Test_class_extends()
 var lines =<< trim END
 vim9script
 class Base
-this.one = 1
+var one = 1
 def GetOne(): number
 return this.one
 enddef
 endclass
 class Child extends Base
-this.two = 2
+var two = 2
 def GetTotal(): number
 return this.one + this.two
 enddef
 endclass
 var o = Child.new()
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class Base
-this.one = 1
+var one = 1
 endclass
 class Child extends Base
-this.two = 2
+var two = 2
 endclass
 var o = Child.new(3, 44)
 assert_equal(3, o.one)
 assert_equal(44, o.two)
 END
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class Base
-this.one = 1
+var one = 1
 endclass
 class Child extends Base extends Base
-this.two = 2
+var two = 2
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1352: Duplicate "extends"', 5)
 lines =<< trim END
 vim9script
 class Child extends BaseClass
-this.two = 2
+var two = 2
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1353: Class name not found: BaseClass', 4)
 lines =<< trim END
 vim9script
 var SomeVar = 99
 class Child extends SomeVar
-this.two = 2
+var two = 2
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1354: Cannot extend SomeVar', 5)
 lines =<< trim END
 vim9script
 class Base
-this.name: string
+var name: string
 def ToString(): string
 return this.name
 enddef
 endclass
 class Child extends Base
-this.age: number
+var age: number
 def ToString(): string
 return super.ToString() .. ': ' .. this.age
 enddef
 endclass
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class Child
-this.age: number
+var age: number
 def ToString(): number
 return this.age
 enddef
 def ToString(): string
 return this.age
 v9.CheckSourceFailure(lines, 'E1355: Duplicate function: ToString', 9)
 lines =<< trim END
 vim9script
 class Child
-this.age: number
+var age: number
 def ToString(): string
 return super .ToString() .. ': ' .. this.age
 enddef
 endclass
 var o = Child.new(42)
 v9.CheckSourceFailure(lines, 'E1356: "super" must be followed by a dot', 1)
 lines =<< trim END
 vim9script
 class Base
-this.name: string
+var name: string
 def ToString(): string
 return this.name
 enddef
 endclass
 v9.CheckSourceFailure(lines, 'E1357: Using "super" not in a class method', 1)
 lines =<< trim END
 vim9script
 class Child
-this.age: number
+var age: number
 def ToString(): string
 return super.ToString() .. ': ' .. this.age
 enddef
 endclass
 var o = Child.new(42)
 v9.CheckSourceFailure(lines, 'E1358: Using "super" not in a child class', 1)
 lines =<< trim END
 vim9script
 class Base
-this.name: string
+var name: string
 static def ToString(): string
 return 'Base class'
 enddef
 endclass
 class Child extends Base
-this.age: number
+var age: number
 def ToString(): string
 return Base.ToString() .. ': ' .. this.age
 enddef
 endclass
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 class Base
-this.value = 1
+var value = 1
 def new(init: number)
 this.value = number + 1
 enddef
 endclass
 class Child extends Base
 # base class with more than one object member
 lines =<< trim END
 vim9script
 class Result
-this.success: bool
+var success: bool
-this.value: any = null
+var value: any = null
 endclass
 class Success extends Result
 def new(this.value = v:none)
 this.success = true
 # Using super, Child invokes Base method which has optional arg. #12471
 lines =<< trim END
 vim9script
 class Base
-this.success: bool = false
+var success: bool = false
 def Method(arg = 0)
 this.success = true
 enddef
 endclass
 def Test_class_import()
 var lines =<< trim END
 vim9script
 export class Animal
-this.kind: string
+var kind: string
-this.name: string
+var name: string
 endclass
 END
 writefile(lines, 'Xanimal.vim', 'D')
 lines =<< trim END
 def Test_abstract_class()
 var lines =<< trim END
 vim9script
 abstract class Base
-this.name: string
+var name: string
 endclass
 class Person extends Base
-this.age: number
+var age: number
 endclass
 var p: Base = Person.new('Peter', 42)
 assert_equal('Peter', p.name)
 assert_equal(42, p.age)
 END
 v9.CheckSourceSuccess(lines)
 lines =<< trim END
 vim9script
 abstract class Base
-this.name: string
+var name: string
 endclass
 class Person extends Base
-this.age: number
+var age: number
 endclass
 var p = Base.new('Peter')
 END
 v9.CheckSourceFailure(lines, 'E1325: Method "new" not found in class "Base"', 8)
 lines =<< trim END
 abstract class Base
-this.name: string
+var name: string
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1316: Class can only be defined in Vim9 script', 1)
 # Abstract class cannot have a "new" function
 def Test_closure_in_class()
 var lines =<< trim END
 vim9script
 class Foo
-this.y: list<string> = ['B']
+var y: list<string> = ['B']
 def new()
 g:result = filter(['A', 'B'], (_, v) => index(this.y, v) == -1)
 enddef
 endclass
 vim9script
 var createdObject: any
 class A
-this.val1: number
+var val1: number
-this.val2: number
+var val2: number
 static def CreateA(...args: list<any>): any
 createdObject = call(A.new, args)
 return createdObject
 enddef
 endclass
 class Observer
 endclass
 class Property
-this.value: any
+var value: any
 def Set(v: any)
 if v != this.value
 this.value = v
 endif
 def Register(observer: Observer)
 enddef
 endclass
 class Bool extends Property
-this.value2: bool
+var value2: bool
 endclass
 def Observe(obj: Property, who: Observer)
 obj.Register(who)
 enddef
 def Test_call_method_in_parent_class()
 var lines =<< trim END
 vim9script
 class Widget
-this._lnum: number = 1
+var _lnum: number = 1
 def SetY(lnum: number)
 this._lnum = lnum
 enddef
 def Test_multi_level_member_access()
 var lines =<< trim END
 vim9script
 class A
-public this.val1: number = 0
+public var val1: number = 0
 endclass
 class B extends A
-public this.val2: number = 0
+public var val2: number = 0
 endclass
 class C extends B
-public this.val3: number = 0
+public var val3: number = 0
 endclass
 def A_members(a: A)
 a.val1 += 1
 enddef
 # new() uses the default return type and there is no return statement
 var lines =<< trim END
 vim9script
 class C
-this._bufnr: number
+var _bufnr: number
 def new(this._bufnr)
 if !bufexists(this._bufnr)
 this._bufnr = -1
 endif
 # new() uses the default return type and an empty 'return' statement
 lines =<< trim END
 vim9script
 class C
-this._bufnr: number
+var _bufnr: number
 def new(this._bufnr)
 if !bufexists(this._bufnr)
 this._bufnr = -1
 return
 # new() uses "any" return type and returns "this"
 lines =<< trim END
 vim9script
 class C
-this._bufnr: number
+var _bufnr: number
 def new(this._bufnr): any
 if !bufexists(this._bufnr)
 this._bufnr = -1
 return this
 # new() uses 'Dict' return type and returns a Dict
 lines =<< trim END
 vim9script
 class C
-this._state: dict<any>
+var _state: dict<any>
 def new(): dict<any>
 this._state = {}
 return this._state
 enddef
 return "hello"
 endif
 enddef
 class C
-this._foo: bool = F()
+var _foo: bool = F()
 endclass
 var c1 = C.new()
 var c2 = C.new()
 END
 def Test_lockvar_object()
 var lines =<< trim END
 vim9script
 class C
-this.val: number
+var val: number
 def new(this.val)
 enddef
 endclass
 var some_dict: dict<C> = { a: C.new(1), b: C.new(2), c: C.new(3), }
 # read-only lockvar from object method
 var lines =<< trim END
 vim9script
 class C
-this.val1: number
+var val1: number
 def Lock()
 lockvar this.val1
 enddef
 endclass
 var o = C.new(3)
 # read-only lockvar from scriptlevel
 lines =<< trim END
 vim9script
 class C
-this.val2: number
+var val2: number
 endclass
 var o = C.new(3)
 lockvar o.val2
 END
 v9.CheckSourceFailure(lines, 'E1335: Variable "val2" in class "C" is not writable')
 # read-only lockvar of scriptlevel variable from def
 lines =<< trim END
 vim9script
 class C
-this.val3: number
+var val3: number
 endclass
 var o = C.new(3)
 def Lock()
 lockvar o.val3
 enddef
 # read-only lockvar of def argument variable
 lines =<< trim END
 vim9script
 class C
-this.val4: number
+var val4: number
 endclass
 def Lock(o: C)
 lockvar o.val4
 enddef
 Lock(C.new(3))
 # read-only lockvar from object method arg
 lines =<< trim END
 vim9script
 class C
-this.val5: number
+var val5: number
 def Lock(o_any: any)
 lockvar o_any.val5
 enddef
 endclass
 var o = C.new(3)
 # read-only lockvar from class method arg
 lines =<< trim END
 vim9script
 class C
-this.val6: number
+var val6: number
 static def Lock(o_any: any)
 lockvar o_any.val6
 enddef
 endclass
 var o = C.new(3)
 # lockvar from object method
 lines =<< trim END
 vim9script
 class C
-public this.val1: number
+public var val1: number
 def Lock()
 lockvar this.val1
 enddef
 endclass
 var o = C.new(3)
 # lockvar from scriptlevel
 lines =<< trim END
 vim9script
 class C
-public this.val2: number
+public var val2: number
 endclass
 var o = C.new(3)
 lockvar o.val2
 END
 v9.CheckSourceFailure(lines, 'E1391: Cannot (un)lock variable "o.val2" in class "C"', 7)
 # lockvar of scriptlevel variable from def
 lines =<< trim END
 vim9script
 class C
-public this.val3: number
+public var val3: number
 endclass
 var o = C.new(3)
 def Lock()
 lockvar o.val3
 enddef
 # lockvar of def argument variable
 lines =<< trim END
 vim9script
 class C
-public this.val4: number
+public var val4: number
 endclass
 def Lock(o: C)
 lockvar o.val4
 enddef
 Lock(C.new(3))
 # lockvar from object method arg
 lines =<< trim END
 vim9script
 class C
-public this.val5: number
+public var val5: number
 def Lock(o_any: any)
 lockvar o_any.val5
 enddef
 endclass
 var o = C.new(3)
 # lockvar from class method arg
 lines =<< trim END
 vim9script
 class C
-public this.val6: number
+public var val6: number
 static def Lock(o_any: any)
 lockvar o_any.val6
 enddef
 endclass
 var o = C.new(3)
 # lockvar bare static from object method
 var lines =<< trim END
 vim9script
 class C
-public static sval1: number
+public static var sval1: number
 def Lock()
 lockvar sval1
 enddef
 endclass
 var o = C.new()
 # lockvar C.static from object method
 lines =<< trim END
 vim9script
 class C
-public static sval2: number
+public static var sval2: number
 def Lock()
 lockvar C.sval2
 enddef
 endclass
 var o = C.new()
 # lockvar bare static from class method
 lines =<< trim END
 vim9script
 class C
-public static sval3: number
+public static var sval3: number
 static def Lock()
 lockvar sval3
 enddef
 endclass
 C.Lock()
 # lockvar C.static from class method
 lines =<< trim END
 vim9script
 class C
-public static sval4: number
+public static var sval4: number
 static def Lock()
 lockvar C.sval4
 enddef
 endclass
 C.Lock()
 # lockvar C.static from script level
 lines =<< trim END
 vim9script
 class C
-public static sval5: number
+public static var sval5: number
 endclass
 lockvar C.sval5
 END
 v9.CheckSourceFailure(lines, 'E1392: Cannot (un)lock class variable "C.sval5" in class "C"', 6)
 # lockvar o.static from script level
 lines =<< trim END
 vim9script
 class C
-public static sval6: number
+public static var sval6: number
 endclass
 var o = C.new()
 lockvar o.sval6
 END
 v9.CheckSourceFailure(lines, 'E1375: Class variable "sval6" accessible only using class "C"', 7)
 # class member in "C". This tests lval_root_is_arg.
 lines =<< trim END
 vim9script
 class C
-public static sval: list<number>
+public static var sval: list<number>
 endclass
 def Lock2(sval: any)
 lockvar sval
 enddef
 # Lock a class.
 lines =<< trim END
 vim9script
 class C
-public static sval: list<number>
+public static var sval: list<number>
 endclass
 def Lock2(sval: any)
 lockvar sval
 enddef
 # Lock an object.
 lines =<< trim END
 vim9script
 class C
-public static sval: list<number>
+public static var sval: list<number>
 endclass
 def Lock2(sval: any)
 lockvar sval
 enddef
 # In this case (unlike previous) "lockvar sval" is a class member.
 lines =<< trim END
 vim9script
 class C
-public static sval: list<number>
+public static var sval: list<number>
 def Lock2()
 lockvar sval
 enddef
 endclass
 # Lock a list element that's nested in an object variable from a :def
 lines =<< trim END
 vim9script
 class C
-public this.val: list<list<number>> = [ [1], [2], [3] ]
+public var val: list<list<number>> = [ [1], [2], [3] ]
 endclass
 def Lock2(obj: any)
 lockvar obj.val[1]
 enddef
 # Lock a list element that's nested in an object variable from scriptlevel
 lines =<< trim END
 vim9script
 class C
-public this.val: list<list<number>> = [ [1], [2], [3] ]
+public var val: list<list<number>> = [ [1], [2], [3] ]
 endclass
 var o = C.new()
 lockvar o.val[1]
 o.val[0] = [9]
 # in an object fetched via a script level list
 lines =<< trim END
 vim9script
 class C
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 def Lock()
 lockvar lc[0]._v1[1]
 enddef
 endclass
 # the same name.
 lines =<< trim END
 vim9script
 class C2
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 def Lock(obj: any)
 lockvar lc[0]._v1[1]
 enddef
 endclass
 class C
-this._v1: list<list<number>>
+var _v1: list<list<number>>
 endclass
 var l = [[1], [2], [3]]
 var o = C.new(l)
 var lc: list<C> = [ o ]
 # variable is at index 1 within class/object
 var lines =<< trim END
 vim9script
 class C
-this.o0: list<list<number>> = [ [0],  [1],  [2]]
+var o0: list<list<number>> = [ [0],  [1],  [2]]
-this.o1: list<list<number>> = [[10], [11], [12]]
+var o1: list<list<number>> = [[10], [11], [12]]
-static c0: list<list<number>> = [[20], [21], [22]]
+static var c0: list<list<number>> = [[20], [21], [22]]
-static c1: list<list<number>> = [[30], [31], [32]]
+static var c1: list<list<number>> = [[30], [31], [32]]
 endclass
 def LockIt(arg: any)
 lockvar arg
 enddef
 var l0o1 = [ [10],  [11],  [12]]
 var l0c0 = [[120], [121], [122]]
 var l0c1 = [[130], [131], [132]]
 class C0
-this.o0: list<list<number>> =   l0o0
+var o0: list<list<number>> =   l0o0
-this.o1: list<list<number>> =   l0o1
+var o1: list<list<number>> =   l0o1
-static c0: list<list<number>> = l0c0
+static var c0: list<list<number>> = l0c0
-static c1: list<list<number>> = l0c1
+static var c1: list<list<number>> = l0c1
 def Islocked(arg: string): number
 return islocked(arg)
 enddef
 static def SIslocked(arg: string): number
 return islocked(arg)
 var l2o1 = [[20010], [20011], [20012]]
 var l2c0 = [[20120], [20121], [20122]]
 var l2c1 = [[20130], [20131], [20132]]
 class C2
-this.o0: list<list<number>> =   l2o0
+var o0: list<list<number>> =   l2o0
-this.o1: list<list<number>> =   l2o1
+var o1: list<list<number>> =   l2o1
-static c0: list<list<number>> = l2c0
+static var c0: list<list<number>> = l2c0
-static c1: list<list<number>> = l2c1
+static var c1: list<list<number>> = l2c1
 def Islocked(arg: string): number
 return islocked(arg)
 enddef
 static def SIslocked(arg: string): number
 return islocked(arg)
 lines =<< trim END
 vim9script
 class C
-this.val = { key: "value" }
+var val = { key: "value" }
 def Islocked(arg: string): number
 return islocked(arg)
 enddef
 endclass
 var obj = C.new()
 # subclasses get their own static copy
 var lines =<< trim END
 vim9script
 class A
-static _svar: number
+static var _svar: number
-this._mvar: number
+var _mvar: number
 def new()
 _svar = 1
 this._mvar = 101
 enddef
 def AccessObject(): number
 def Test_dup_member_variable()
 # Duplicate member variable
 var lines =<< trim END
 vim9script
 class C
-this.val = 10
+var val = 10
-this.val = 20
+var val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: val', 4)
 # Duplicate protected member variable
 lines =<< trim END
 vim9script
 class C
-this._val = 10
+var _val = 10
-this._val = 20
+var _val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: _val', 4)
 # Duplicate public member variable
 lines =<< trim END
 vim9script
 class C
-public this.val = 10
+public var val = 10
-public this.val = 20
+public var val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: val', 4)
 # Duplicate protected member variable
 lines =<< trim END
 vim9script
 class C
-this.val = 10
+var val = 10
-this._val = 20
+var _val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: _val', 4)
 # Duplicate public and protected member variable
 lines =<< trim END
 vim9script
 class C
-this._val = 20
+var _val = 20
-public this.val = 10
+public var val = 10
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: val', 4)
 # Duplicate class member variable
 lines =<< trim END
 vim9script
 class C
-static s: string = "abc"
+static var s: string = "abc"
-static _s: string = "def"
+static var _s: string = "def"
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: _s', 4)
 # Duplicate public and protected class member variable
 lines =<< trim END
 vim9script
 class C
-public static s: string = "abc"
+public static var s: string = "abc"
-static _s: string = "def"
+static var _s: string = "def"
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: _s', 4)
 # Duplicate class and object member variable
 lines =<< trim END
 vim9script
 class C
-static val = 10
+static var val = 10
-this.val = 20
+var val = 20
 def new()
 enddef
 endclass
 var c = C.new()
 assert_equal(10, C.val)
 # Duplicate object member variable in a derived class
 lines =<< trim END
 vim9script
 class A
-this.val = 10
+var val = 10
 endclass
 class B extends A
 endclass
 class C extends B
-this.val = 20
+var val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: val', 9)
 # Duplicate object protected member variable in a derived class
 lines =<< trim END
 vim9script
 class A
-this._val = 10
+var _val = 10
 endclass
 class B extends A
 endclass
 class C extends B
-this._val = 20
+var _val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: _val', 9)
 # Duplicate object protected member variable in a derived class
 lines =<< trim END
 vim9script
 class A
-this.val = 10
+var val = 10
 endclass
 class B extends A
 endclass
 class C extends B
-this._val = 20
+var _val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: _val', 9)
 # Duplicate object member variable in a derived class
 lines =<< trim END
 vim9script
 class A
-this._val = 10
+var _val = 10
 endclass
 class B extends A
 endclass
 class C extends B
-this.val = 20
+var val = 20
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: val', 9)
 # Two member variables with a common prefix
 lines =<< trim END
 vim9script
 class A
-public static svar2: number
+public static var svar2: number
-public static svar: number
+public static var svar: number
 endclass
 END
 v9.CheckSourceSuccess(lines)
 enddef
 def Test_private_member_access_outside_class()
 # protected object member variable
 var lines =<< trim END
 vim9script
 class A
-this._val = 10
+var _val = 10
 def GetVal(): number
 return this._val
 enddef
 endclass
 def T()
 # access a non-existing protected object member variable
 lines =<< trim END
 vim9script
 class A
-this._val = 10
+var _val = 10
 endclass
 def T()
 var a = A.new()
 a._a = 1
 enddef
 # protected static member variable
 lines =<< trim END
 vim9script
 class A
-static _val = 10
+static var _val = 10
 endclass
 def T()
 var a = A.new()
 var x = a._val
 enddef
 # protected static member variable
 lines =<< trim END
 vim9script
 class A
-static _val = 10
+static var _val = 10
 endclass
 def T()
 var a = A.new()
 a._val = 3
 enddef
 # protected static class variable
 lines =<< trim END
 vim9script
 class A
-static _val = 10
+static var _val = 10
 endclass
 def T()
 var x = A._val
 enddef
 T()
 # protected static class variable
 lines =<< trim END
 vim9script
 class A
-static _val = 10
+static var _val = 10
 endclass
 def T()
 A._val = 3
 enddef
 T()
 " Test for changing the member access of an interface in a implementation class
 def Test_change_interface_member_access()
 var lines =<< trim END
 vim9script
 interface A
-this.val: number
+var val: number
 endinterface
 class B implements A
-public this.val = 10
+public var val = 10
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1367: Access level of variable "val" of interface "A" is different', 7)
 lines =<< trim END
 vim9script
 interface A
-this.val: number
+var val: number
 endinterface
 class B implements A
-public this.val = 10
+public var val = 10
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1367: Access level of variable "val" of interface "A" is different', 7)
 enddef
 " Test for trying to change a readonly member from a def function
 def Test_readonly_member_change_in_def_func()
 var lines =<< trim END
 vim9script
 class A
-this.val: number
+var val: number
 endclass
 def T()
 var a = A.new()
 a.val = 20
 enddef
 " Test for reading and writing a class member from a def function
 def Test_modify_class_member_from_def_function()
 var lines =<< trim END
 vim9script
 class A
-this.var1: number = 10
+var var1: number = 10
-public static var2: list<number> = [1, 2]
+public static var var2: list<number> = [1, 2]
-public static var3: dict<number> = {a: 1, b: 2}
+public static var var3: dict<number> = {a: 1, b: 2}
-static _priv_var4: number = 40
+static var _priv_var4: number = 40
 endclass
 def T()
 assert_equal([1, 2], A.var2)
 assert_equal({a: 1, b: 2}, A.var3)
 A.var2 = [3, 4]
 " Test for accessing a class member variable using an object
 def Test_class_variable_access_using_object()
 var lines =<< trim END
 vim9script
 class A
-public static svar1: list<number> = [1]
+public static var svar1: list<number> = [1]
-public static svar2: list<number> = [2]
+public static var svar2: list<number> = [2]
 endclass
 A.svar1->add(3)
 A.svar2->add(4)
 assert_equal([1, 3], A.svar1)
 # Cannot read from a class variable using an object in script context
 lines =<< trim END
 vim9script
 class A
-public this.var1: number
+public var var1: number
-public static svar2: list<number> = [1]
+public static var svar2: list<number> = [1]
 endclass
 var a = A.new()
 echo a.svar2
 END
 # Cannot write to a class variable using an object in script context
 lines =<< trim END
 vim9script
 class A
-public this.var1: number
+public var var1: number
-public static svar2: list<number> = [1]
+public static var svar2: list<number> = [1]
 endclass
 var a = A.new()
 a.svar2 = [2]
 END
 # Cannot read from a class variable using an object in def method context
 lines =<< trim END
 vim9script
 class A
-public this.var1: number
+public var var1: number
-public static svar2: list<number> = [1]
+public static var svar2: list<number> = [1]
 endclass
 def T()
 var a = A.new()
 echo a.svar2
 # Cannot write to a class variable using an object in def method context
 lines =<< trim END
 vim9script
 class A
-public this.var1: number
+public var var1: number
-public static svar2: list<number> = [1]
+public static var svar2: list<number> = [1]
 endclass
 def T()
 var a = A.new()
 a.svar2 = [2]
 def Test_class_variable()
 var lines =<< trim END
 vim9script
 class A
-public static val: number = 10
+public static var val: number = 10
 static def ClassFunc()
 assert_equal(10, val)
 enddef
 def ObjFunc()
 assert_equal(10, val)
 # Modifying a parent class variable from a child class method
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 class B extends A
 static def ClassFunc()
 val = 20
 # Reading a parent class variable from a child class method
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 class B extends A
 static def ClassFunc()
 var i = val
 # Modifying a parent class variable from a child object method
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 class B extends A
 def ObjFunc()
 val = 20
 # Reading a parent class variable from a child object method
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 class B extends A
 def ObjFunc()
 var i = val
 # Modifying a class variable using an object at script level
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 var a = A.new()
 a.val = 20
 END
 v9.CheckSourceFailure(lines, 'E1375: Class variable "val" accessible only using class "A"', 7)
 # Reading a class variable using an object at script level
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 var a = A.new()
 var i = a.val
 END
 v9.CheckSourceFailure(lines, 'E1375: Class variable "val" accessible only using class "A"', 7)
 # Modifying a class variable using an object at function level
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 def T()
 var a = A.new()
 a.val = 20
 # Reading a class variable using an object at function level
 lines =<< trim END
 vim9script
 class A
-static val: number = 10
+static var val: number = 10
 endclass
 def T()
 var a = A.new()
 var i = a.val
 enddef
 T()
 END
 v9.CheckSourceFailure(lines, 'E1375: Class variable "val" accessible only using class "A"', 2)
+# Use old implicit var declaration syntax (without initialization)
+lines =<< trim END
+vim9script
+class A
+static val: number
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1368: Static must be followed by "var" or "def"', 4)
+# Use old implicit var declaration syntax (with initialization)
+lines =<< trim END
+vim9script
+class A
+static val: number = 10
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1368: Static must be followed by "var" or "def"', 4)
+# Use old implicit var declaration syntax (type inferred)
+lines =<< trim END
+vim9script
+class A
+static val = 10
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1368: Static must be followed by "var" or "def"', 4)
+# Missing ":var" in "var" class variable declaration (without initialization)
+lines =<< trim END
+vim9script
+class A
+static var: number
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1329: Invalid class variable declaration: static var: number', 4)
+# Missing ":var" in "var" class variable declaration (with initialization)
+lines =<< trim END
+vim9script
+class A
+static var: number = 10
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1329: Invalid class variable declaration: static var: number = 10', 4)
+# Missing ":var" in "var" class variable declaration (type inferred)
+lines =<< trim END
+vim9script
+class A
+static var = 10
+endclass
+END
+v9.CheckSourceFailure(lines, 'E1329: Invalid class variable declaration: static var = 10', 4)
 enddef
 " Test for using a duplicate class method and class variable in a child class
 def Test_dup_class_member()
 # duplicate class variable, class method and overridden object method
 var lines =<< trim END
 vim9script
 class A
-static sval = 100
+static var sval = 100
 static def Check()
 assert_equal(100, sval)
 enddef
 def GetVal(): number
 return sval
 enddef
 endclass
 class B extends A
-static sval = 200
+static var sval = 200
 static def Check()
 assert_equal(200, sval)
 enddef
 def GetVal(): number
 return sval
 # duplicate class variable and class method
 lines =<< trim END
 vim9script
 class A
-static sval = 100
+static var sval = 100
 static def Check()
 assert_equal(100, sval)
 enddef
 def GetVal(): number
 return sval
 enddef
 endclass
 class B extends A
-static sval = 200
+static var sval = 200
 static def Check()
 assert_equal(200, sval)
 enddef
 endclass
 class A
 endclass
 class B extends A
 endclass
 class C extends B
-public static rw_class_var = 1
+public static var rw_class_var = 1
-public this.rw_obj_var = 2
+public var rw_obj_var = 2
 static def ClassMethod(): number
 return 3
 enddef
 def ObjMethod(): number
 return 4
 " variable or a protected method or a public variable
 def Test_interface_with_unsupported_members()
 var lines =<< trim END
 vim9script
 interface A
-static num: number
+static var num: number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 lines =<< trim END
 vim9script
 interface A
-static _num: number
+static var _num: number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 lines =<< trim END
 vim9script
 interface A
-public static num: number
+public static var num: number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1387: Public variable not supported in an interface', 3)
 lines =<< trim END
 vim9script
 interface A
-public static num: number
+public static var num: number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1387: Public variable not supported in an interface', 3)
 lines =<< trim END
 vim9script
 interface A
-static _num: number
+static var _num: number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 lines =<< trim END
 v9.CheckSourceFailure(lines, 'E1378: Static member not supported in an interface', 3)
 lines =<< trim END
 vim9script
 interface A
-this._Foo: list<string>
+var _Foo: list<string>
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1379: Protected variable not supported in an interface', 3)
 lines =<< trim END
 " Test for extending an interface
 def Test_extend_interface()
 var lines =<< trim END
 vim9script
 interface A
-this.var1: list<string>
+var var1: list<string>
 def Foo()
 endinterface
 interface B extends A
-this.var2: dict<string>
+var var2: dict<string>
 def Bar()
 endinterface
 class C implements A, B
-this.var1 = [1, 2]
+var var1 = [1, 2]
 def Foo()
 enddef
-this.var2 = {a: '1'}
+var var2 = {a: '1'}
 def Bar()
 enddef
 endclass
 END
 v9.CheckSourceSuccess(lines)
 vim9script
 interface A
 def Foo()
 endinterface
 interface B extends A
-this.var2: dict<string>
+var var2: dict<string>
 endinterface
 class C implements A, B
-this.var2 = {a: '1'}
+var var2 = {a: '1'}
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1349: Method "Foo" of interface "A" is not implemented', 10)
 lines =<< trim END
 vim9script
 interface A
 def Foo()
 endinterface
 interface B extends A
-this.var2: dict<string>
+var var2: dict<string>
 endinterface
 class C implements A, B
 def Foo()
 enddef
 endclass
 # Variable type in an extended interface is of different type
 lines =<< trim END
 vim9script
 interface A
-this.val1: number
+var val1: number
 endinterface
 interface B extends A
-this.val2: string
+var val2: string
 endinterface
 interface C extends B
-this.val1: string
+var val1: string
-this.val2: number
+var val2: number
 endinterface
 END
 v9.CheckSourceFailure(lines, 'E1382: Variable "val1": type mismatch, expected number but got string', 11)
 enddef
 interface Intf
 def F1(): list<list<number>>
 def F2(): list<list<number>>
 def F3(): list<list<number>>
-this.var1: list<dict<number>>
+var var1: list<dict<number>>
-this.var2: list<dict<number>>
+var var2: list<dict<number>>
-this.var3: list<dict<number>>
+var var3: list<dict<number>>
 endinterface
 class A
 def A1()
 enddef
 def F3(): list<list<number>>
 return [[3]]
 enddef
-this.v1: list<list<number>> = [[0]]
+var v1: list<list<number>> = [[0]]
-this.var3 = [{c: 30}]
+var var3 = [{c: 30}]
 endclass
 class B extends A
 def B1()
 enddef
 def F2(): list<list<number>>
 return [[2]]
 enddef
-this.v2: list<list<number>> = [[0]]
+var v2: list<list<number>> = [[0]]
-this.var2 = [{b: 20}]
+var var2 = [{b: 20}]
 endclass
 class C extends B implements Intf
 def C1()
 enddef
 def F1(): list<list<number>>
 return [[1]]
 enddef
-this.v3: list<list<number>> = [[0]]
+var v3: list<list<number>> = [[0]]
-this.var1 = [{a: 10}]
+var var1 = [{a: 10}]
 endclass
 def T(if: Intf)
 assert_equal([[1]], if.F1())
 assert_equal([[2]], if.F2())
 # One of the interface variables is not present
 lines =<< trim END
 vim9script
 interface Intf
-this.var1: list<dict<number>>
+var var1: list<dict<number>>
-this.var2: list<dict<number>>
+var var2: list<dict<number>>
-this.var3: list<dict<number>>
+var var3: list<dict<number>>
 endinterface
 class A
-this.v1: list<list<number>> = [[0]]
+var v1: list<list<number>> = [[0]]
 endclass
 class B extends A
-this.v2: list<list<number>> = [[0]]
+var v2: list<list<number>> = [[0]]
-this.var2 = [{b: 20}]
+var var2 = [{b: 20}]
 endclass
 class C extends B implements Intf
-this.v3: list<list<number>> = [[0]]
+var v3: list<list<number>> = [[0]]
-this.var1 = [{a: 10}]
+var var1 = [{a: 10}]
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1348: Variable "var3" of interface "Intf" is not implemented', 21)
 # One of the interface variables is of different type
 lines =<< trim END
 vim9script
 interface Intf
-this.var1: list<dict<number>>
+var var1: list<dict<number>>
-this.var2: list<dict<number>>
+var var2: list<dict<number>>
-this.var3: list<dict<number>>
+var var3: list<dict<number>>
 endinterface
 class A
-this.v1: list<list<number>> = [[0]]
+var v1: list<list<number>> = [[0]]
-this.var3: list<dict<string>>
+var var3: list<dict<string>>
 endclass
 class B extends A
-this.v2: list<list<number>> = [[0]]
+var v2: list<list<number>> = [[0]]
-this.var2 = [{b: 20}]
+var var2 = [{b: 20}]
 endclass
 class C extends B implements Intf
-this.v3: list<list<number>> = [[0]]
+var v3: list<list<number>> = [[0]]
-this.var1 = [{a: 10}]
+var var1 = [{a: 10}]
 endclass
 END
 v9.CheckSourceFailure(lines, 'E1382: Variable "var3": type mismatch, expected list<dict<number>> but got list<dict<string>>', 22)
 enddef
 " Test for extending an interface with duplicate variables and methods
 def Test_interface_extends_with_dup_members()
 var lines =<< trim END
 vim9script
 interface A
-this.n1: number
+var n1: number
 def Foo1(): number
 endinterface
 interface B extends A
-this.n2: number
+var n2: number
-this.n1: number
+var n1: number
 def Foo2(): number
 def Foo1(): number
 endinterface
 class C implements B
-this.n1 = 10
+var n1 = 10
-this.n2 = 20
+var n2 = 20
 def Foo1(): number
 return 30
 enddef
 def Foo2(): number
 return 40
 " concrete type in the interface
 def Test_implements_using_var_type_any()
 var lines =<< trim END
 vim9script
 interface A
-this.val: list<dict<string>>
+var val: list<dict<string>>
 endinterface
 class B implements A
-this.val = [{a: '1'}, {b: '2'}]
+var val = [{a: '1'}, {b: '2'}]
 endclass
 var b = B.new()
 assert_equal([{a: '1'}, {b: '2'}], b.val)
 END
 v9.CheckSourceSuccess(lines)
 # initialize instance variable using a different type
 lines =<< trim END
 vim9script
 interface A
-this.val: list<dict<string>>
+var val: list<dict<string>>
 endinterface
 class B implements A
-this.val = {a: 1, b: 2}
+var val = {a: 1, b: 2}
 endclass
 var b = B.new()
 END
 v9.CheckSourceFailure(lines, 'E1382: Variable "val": type mismatch, expected list<dict<string>> but got dict<number>', 1)
 enddef
 def Test_nested_object_assignment()
 var lines =<< trim END
 vim9script
 class A
-this.value: number
+var value: number
 endclass
 class B
-this.a: A = A.new()
+var a: A = A.new()
 endclass
 class C
-this.b: B = B.new()
+var b: B = B.new()
 endclass
 class D
-this.c: C = C.new()
+var c: C = C.new()
 endclass
 def T(da: D)
 da.c.b.a.value = 10
 enddef
 def Test_dict_object_member()
 var lines =<< trim END
 vim9script
 class Context
-public this.state: dict<number> = {}
+public var state: dict<number> = {}
 def GetState(): dict<number>
 return this.state
 enddef
 endclass
 def Test_duplicate_variable()
 # Object variable name is same as the class variable name
 var lines =<< trim END
 vim9script
 class A
-public static sval: number
+public static var sval: number
-public this.sval: number
+public var sval: number
 endclass
 var a = A.new()
 END
 v9.CheckSourceFailure(lines, 'E1369: Duplicate variable: sval', 4)
 # Duplicate variable name and calling a class method
 lines =<< trim END
 vim9script
 class A
-public static sval: number
+public static var sval: number
-public this.sval: number
+public var sval: number
 def F1()
 echo this.sval
 enddef
 static def F2()
 echo sval
 # Duplicate variable with an empty constructor
 lines =<< trim END
 vim9script
 class A
-public static sval: number
+public static var sval: number
-public this.sval: number
+public var sval: number
 def new()
 enddef
 endclass
 var a = A.new()
 END
 'null_channel', 'null_job', 'super', 'this']
 var lines =<< trim eval END
 vim9script
 class C
-public this.{kword}: list<number> = [1, 2, 3]
+public var {kword}: list<number> = [1, 2, 3]
 endclass
 var o = C.new()
 END
 v9.CheckSourceFailure(lines, $'E1034: Cannot use reserved name {kword}', 3)
 lines =<< trim eval END
 vim9script
 class C
-public this.{kword}: list<number> = [1, 2, 3]
+public var {kword}: list<number> = [1, 2, 3]
 def new()
 enddef
 endclass
 var o = C.new()
 END
 v9.CheckSourceFailure(lines, $'E1034: Cannot use reserved name {kword}', 3)
 lines =<< trim eval END
 vim9script
 class C
-public this.{kword}: list<number> = [1, 2, 3]
+public var {kword}: list<number> = [1, 2, 3]
 def new()
 enddef
 def F()
 echo this.{kword}
 enddef
 # class variable name
 if kword != 'this'
 lines =<< trim eval END
 vim9script
 class C
-public static {kword}: list<number> = [1, 2, 3]
+public static var {kword}: list<number> = [1, 2, 3]
 endclass
 END
 v9.CheckSourceFailure(lines, $'E1034: Cannot use reserved name {kword}', 3)
 endif
 endfor
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
+public static var Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
 endclass
 test_garbagecollect_now()
 A.Fn = "abc"
 END
 call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected func(list<dict<blob>>): dict<list<blob>> but got string', 9)
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
+public static var Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
 def Bar()
 Fn = "abc"
 enddef
 endclass
 var a = A.new()
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
+public static var Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
 endclass
 def Bar()
 A.Fn = "abc"
 enddef
 test_garbagecollect_now()
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn = Foo
+public static var Fn = Foo
 endclass
 test_garbagecollect_now()
 A.Fn = "abc"
 END
 call v9.CheckSourceFailure(lines, 'E1012: Type mismatch; expected func(list<dict<blob>>): dict<list<blob>> but got string', 9)
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn = Foo
+public static var Fn = Foo
 def Bar()
 Fn = "abc"
 enddef
 endclass
 var a = A.new()
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn = Foo
+public static var Fn = Foo
 endclass
 def Bar()
 A.Fn = "abc"
 enddef
 test_garbagecollect_now()
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn: any = Foo
+public static var Fn: any = Foo
-public static Fn2: any
+public static var Fn2: any
 endclass
 test_garbagecollect_now()
 assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(A.Fn))
 A.Fn = "abc"
 test_garbagecollect_now()
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn: any = Foo
+public static var Fn: any = Foo
-public static Fn2: any
+public static var Fn2: any
 def Bar()
 assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(Fn))
 Fn = "abc"
 assert_equal('string', typename(Fn))
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public static Fn: any = Foo
+public static var Fn: any = Foo
-public static Fn2: any
+public static var Fn2: any
 endclass
 def Bar()
 assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(A.Fn))
 A.Fn = "abc"
 call v9.CheckSourceSuccess(lines)
 let lines =<< trim END
 vim9script
 class A
-public static foo = [0z10, 0z20]
+public static var foo = [0z10, 0z20]
 endclass
 assert_equal([0z10, 0z20], A.foo)
 A.foo = [0z30]
 assert_equal([0z30], A.foo)
 var a = A.foo
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
+public var Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
 endclass
 var a = A.new()
 test_garbagecollect_now()
 a.Fn = "abc"
 END
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
+public var Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
 def Bar()
 this.Fn = "abc"
 this.Fn = Foo
 enddef
 endclass
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
+public var Fn: func(list<dict<blob>>): dict<list<blob>> = Foo
 endclass
 def Bar()
 var a = A.new()
 a.Fn = "abc"
 a.Fn = Foo
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn = Foo
+public var Fn = Foo
 endclass
 var a = A.new()
 test_garbagecollect_now()
 a.Fn = "abc"
 END
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn = Foo
+public var Fn = Foo
 def Bar()
 this.Fn = "abc"
 this.Fn = Foo
 enddef
 endclass
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn = Foo
+public var Fn = Foo
 endclass
 def Bar()
 var a = A.new()
 a.Fn = "abc"
 a.Fn = Foo
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn: any = Foo
+public var Fn: any = Foo
-public this.Fn2: any
+public var Fn2: any
 endclass
 var a = A.new()
 test_garbagecollect_now()
 assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(a.Fn))
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn: any = Foo
+public var Fn: any = Foo
-public this.Fn2: any
+public var Fn2: any
 def Bar()
 assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(this.Fn))
 this.Fn = "abc"
 assert_equal('string', typename(this.Fn))
 vim9script
 def Foo(l: list<dict<blob>>): dict<list<blob>>
 return {}
 enddef
 class A
-public this.Fn: any = Foo
+public var Fn: any = Foo
-public this.Fn2: any
+public var Fn2: any
 endclass
 def Bar()
 var a = A.new()
 assert_equal('func(list<dict<blob>>): dict<list<blob>>', typename(a.Fn))
 " use-after-free error.
 def Test_recursive_object_method_call()
 var lines =<< trim END
 vim9script
 class A
-this.val: number = 0
+var val: number = 0
 def Foo(): number
 if this.val >= 90
 return this.val
 endif
 this.val += 1
 " Test for recursively calling a class method.
 def Test_recursive_class_method_call()
 var lines =<< trim END
 vim9script
 class A
-static val: number = 0
+static var val: number = 0
 static def Foo(): number
 if val >= 90
 return val
 endif
 val += 1
 def Test_op_and_assignment()
 # Using += with a class variable
 var lines =<< trim END
 vim9script
 class A
-public static val: list<number> = []
+public static var val: list<number> = []
 static def Foo(): list<number>
 val += [1]
 return val
 enddef
 endclass
 # Using += with an object variable
 lines =<< trim END
 vim9script
 class A
-public this.val: list<number> = []
+public var val: list<number> = []
 def Foo(): list<number>
 this.val += [1]
 return this.val
 enddef
 endclass
 # Using object method funcref at the script level
 lines =<< trim END
 vim9script
 class A
-this.val: number
+var val: number
 def Foo(): number
 return this.val
 enddef
 endclass
 var a = A.new(345)
 # Using object method funcref using call()
 lines =<< trim END
 vim9script
 class A
-this.val: number
+var val: number
 def Foo(): number
 return this.val
 enddef
 endclass
 # Using class method funcref at the script level
 lines =<< trim END
 vim9script
 class A
-public static val: number
+public static var val: number
 static def Foo(): number
 return val
 enddef
 endclass
 A.val = 567
 # Using class method funcref using call()
 lines =<< trim END
 vim9script
 class A
-public static val: number
+public static var val: number
 static def Foo(): number
 return val
 enddef
 endclass
 def Foo(n: number): number
 return n * 10
 enddef
 class A
-this.Cb: func(number): number = Foo
+var Cb: func(number): number = Foo
 def Bar()
 assert_equal(200, this.Cb(20))
 enddef
 endclass
 def Foo(n: number): number
 return n * 10
 enddef
 class A
-this.Cb: func(number): number = Foo
+var Cb: func(number): number = Foo
 endclass
 def Bar()
 var a = A.new()
 assert_equal(200, a.Cb(20))
 def Foo(n: number): number
 return n * 10
 enddef
 class A
-this.Cb: func(number): number = Foo
+var Cb: func(number): number = Foo
 endclass
 var a = A.new()
 assert_equal(200, a.Cb(20))
 END
 # Using a funcref object variable pointing to an object method in an object
 # method.
 lines =<< trim END
 vim9script
 class A
-this.Cb: func(number): number = this.Foo
+var Cb: func(number): number = this.Foo
 def Foo(n: number): number
 return n * 10
 enddef
 def Bar()
 assert_equal(200, this.Cb(20))
 # Using a funcref object variable pointing to an object method in a def
 # method.
 lines =<< trim END
 vim9script
 class A
-this.Cb: func(number): number = this.Foo
+var Cb: func(number): number = this.Foo
 def Foo(n: number): number
 return n * 10
 enddef
 endclass
 # Using a funcref object variable pointing to an object method at script
 # level.
 lines =<< trim END
 vim9script
 class A
-this.Cb = this.Foo
+var Cb = this.Foo
 def Foo(n: number): number
 return n * 10
 enddef
 endclass
 def Foo(n: number): number
 return n * 10
 enddef
 class A
-static Cb = Foo
+static var Cb = Foo
 static def Bar()
 assert_equal(200, Cb(20))
 enddef
 endclass
 def Foo(n: number): number
 return n * 10
 enddef
 class A
-public static Cb = Foo
+public static var Cb = Foo
 endclass
 def Bar()
 assert_equal(200, A.Cb(20))
 enddef
 def Foo(n: number): number
 return n * 10
 enddef
 class A
-public static Cb = Foo
+public static var Cb = Foo
 endclass
 assert_equal(200, A.Cb(20))
 END
 v9.CheckSourceSuccess(lines)
 # Using a funcref class variable pointing to a class method in a class
 # method.
 lines =<< trim END
 vim9script
 class A
-static Cb: func(number): number
+static var Cb: func(number): number
 static def Foo(n: number): number
 return n * 10
 enddef
 static def Init()
 Cb = Foo
 # Using a funcref class variable pointing to a class method in a def method.
 lines =<< trim END
 vim9script
 class A
-static Cb: func(number): number
+static var Cb: func(number): number
 static def Foo(n: number): number
 return n * 10
 enddef
 static def Init()
 Cb = Foo
 # Using a funcref class variable pointing to a class method at script level.
 lines =<< trim END
 vim9script
 class A
-static Cb: func(number): number
+static var Cb: func(number): number
 static def Foo(n: number): number
 return n * 10
 enddef
 static def Init()
 Cb = Foo
 # Use the popup from the script level
 var lines =<< trim END
 vim9script
 class A
-this.selection: number = -1
+var selection: number = -1
-this.filterkeys: list<string> = []
+var filterkeys: list<string> = []
 def PopupFilter(id: number, key: string): bool
 add(this.filterkeys, key)
 return popup_filter_yesno(id, key)
 enddef
 # Use the popup from a def function
 lines =<< trim END
 vim9script
 class A
-this.selection: number = -1
+var selection: number = -1
-this.filterkeys: list<string> = []
+var filterkeys: list<string> = []
 def PopupFilter(id: number, key: string): bool
 add(this.filterkeys, key)
 return popup_filter_yesno(id, key)
 enddef
 # Use the popup from the script level
 var lines =<< trim END
 vim9script
 class A
-static selection: number = -1
+static var selection: number = -1
-static filterkeys: list<string> = []
+static var filterkeys: list<string> = []
 static def PopupFilter(id: number, key: string): bool
 add(filterkeys, key)
 return popup_filter_yesno(id, key)
 enddef
 # Use the popup from a def function
 lines =<< trim END
 vim9script
 class A
-static selection: number = -1
+static var selection: number = -1
-static filterkeys: list<string> = []
+static var filterkeys: list<string> = []
 static def PopupFilter(id: number, key: string): bool
 add(filterkeys, key)
 return popup_filter_yesno(id, key)
 enddef
 # Use the timer callback from script level
 var lines =<< trim END
 vim9script
 class A
-this.timerTick: number = -1
+var timerTick: number = -1
 def TimerCb(timerID: number)
 this.timerTick = 6
 enddef
 endclass
 # Use the timer callback from a def function
 lines =<< trim END
 vim9script
 class A
-this.timerTick: number = -1
+var timerTick: number = -1
 def TimerCb(timerID: number)
 this.timerTick = 6
 enddef
 endclass
 # Use the timer callback from script level
 var lines =<< trim END
 vim9script
 class A
-static timerTick: number = -1
+static var timerTick: number = -1
 static def TimerCb(timerID: number)
 timerTick = 6
 enddef
 endclass
 # Use the timer callback from a def function
 lines =<< trim END
 vim9script
 class A
-static timerTick: number = -1
+static var timerTick: number = -1
 static def TimerCb(timerID: number)
 timerTick = 6
 enddef
 endclass
 " operator.
 def Test_class_variable_as_operands()
 var lines =<< trim END
 vim9script
 class Tests
-static truthy: bool = true
+static var truthy: bool = true
-public static TruthyFn: func
+public static var TruthyFn: func
-static list: list<any> = []
+static var list: list<any> = []
-static four: number = 4
+static var four: number = 4
-static str: string = 'hello'
+static var str: string = 'hello'
 static def Str(): string
 return str
 enddef
 def Test_dict_member_key_type_check()
 var lines =<< trim END
 vim9script
 abstract class State
-this.numbers: dict<string> = {0: 'nil', 1: 'unity'}
+var numbers: dict<string> = {0: 'nil', 1: 'unity'}
 endclass
 class Test extends State
 def ObjMethodTests()
 var cursor: number = 0
 lines =<< trim END
 vim9script
 class A
-this.numbers: dict<string> = {a: '1', b: '2'}
+var numbers: dict<string> = {a: '1', b: '2'}
 def new()
 enddef
 def Foo()
 lines =<< trim END
 vim9script
 class A
-this.numbers: dict<number> = {a: 1, b: 2}
+var numbers: dict<number> = {a: 1, b: 2}
 def new()
 enddef
 def Foo()

Mercurial > vim

comparison src/testdir/test_vim9_class.vim @ 33942:3bba09502b8d v9.0.2167