Put 'thisReceiver' declaration in class

Interfaces also have 'thisReceiver'

compiler/testData/ir/irText/declarations/classLevelProperties.txt

@@ -1,6 +1,6 @@
 FILE /classLevelProperties.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

compiler/testData/ir/irText/declarations/delegatedProperties.txt

@@ -19,7 +19,7 @@ FILE /delegatedProperties.kt
             thisRef: CONST Null type=kotlin.Nothing? value='null'
             property: PROPERTY_REFERENCE 'test1: Int' field=null getter='<get-test1>(): Int' setter=null type=kotlin.reflect.KProperty0<kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>)
       VALUE_PARAMETER value-parameter map: kotlin.collections.MutableMap<kotlin.String, kotlin.Any>
       BLOCK_BODY

compiler/testData/ir/irText/declarations/fakeOverrides.txt

@@ -1,5 +1,6 @@
 FILE /fakeOverrides.kt
   CLASS INTERFACE IFooStr
+    $this: VALUE_PARAMETER this@IFooStr: IFooStr
     FUN public abstract fun foo(x: kotlin.String): kotlin.Unit
       $this: VALUE_PARAMETER this@IFooStr: IFooStr
       VALUE_PARAMETER value-parameter x: kotlin.String
@@ -7,6 +8,7 @@ FILE /fakeOverrides.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS INTERFACE IBar
+    $this: VALUE_PARAMETER this@IBar: IBar
     PROPERTY public abstract val bar: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-bar>(): kotlin.Int
         $this: VALUE_PARAMETER this@IBar: IBar
@@ -14,7 +16,7 @@ FILE /fakeOverrides.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS CFoo
-    $new: VALUE_PARAMETER this@CFoo: CFoo<T>
+    $this: VALUE_PARAMETER this@CFoo: CFoo<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor CFoo<T>()
       BLOCK_BODY
@@ -28,7 +30,7 @@ FILE /fakeOverrides.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1
+    $this: VALUE_PARAMETER this@Test1: Test1
     CONSTRUCTOR public constructor Test1()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor CFoo()'

compiler/testData/ir/irText/declarations/interfaceProperties.txt

@@ -1,5 +1,6 @@
 FILE /interfaceProperties.kt
   CLASS INTERFACE C
+    $this: VALUE_PARAMETER this@C: C
     PROPERTY public abstract val test1: kotlin.Int
       FUN DEFAULT_PROPERTY_ACCESSOR public abstract fun <get-test1>(): kotlin.Int
         $this: VALUE_PARAMETER this@C: C

compiler/testData/ir/irText/declarations/parameters/class.txt

@@ -1,7 +1,9 @@
 FILE /class.kt
   CLASS INTERFACE TestInterface
+    $this: VALUE_PARAMETER this@TestInterface: TestInterface<T>
     TYPE_PARAMETER <T>
     CLASS INTERFACE TestNestedInterface
+      $this: VALUE_PARAMETER this@TestNestedInterface: TestNestedInterface<TT>
       TYPE_PARAMETER <TT>
       FUN FAKE_OVERRIDE public open override fun equals(other: kotlin.Any?): kotlin.Boolean
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
@@ -10,14 +12,14 @@ FILE /class.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test<T0>
+    $this: VALUE_PARAMETER this@Test: Test<T0>
     TYPE_PARAMETER <T0>
     CONSTRUCTOR public constructor Test<T0>()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Test'
     CLASS CLASS TestNested
-      $new: VALUE_PARAMETER this@TestNested: TestNested<T1>
+      $this: VALUE_PARAMETER this@TestNested: TestNested<T1>
       TYPE_PARAMETER <T1>
       CONSTRUCTOR public constructor TestNested<T1>()
         BLOCK_BODY
@@ -27,7 +29,7 @@ FILE /class.kt
       FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
       FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER this@TestInner: TestInner<T2, T0>
+      $this: VALUE_PARAMETER this@TestInner: TestInner<T2, T0>
       TYPE_PARAMETER <T2>
       CONSTRUCTOR public constructor TestInner<T2>()
         $outer: VALUE_PARAMETER this@Test: Test<T0>

compiler/testData/ir/irText/declarations/parameters/constructor.txt

@@ -1,6 +1,6 @@
 FILE /constructor.kt
   CLASS CLASS Test1
-    $new: VALUE_PARAMETER this@Test1: Test1<T1, T2>
+    $this: VALUE_PARAMETER this@Test1: Test1<T1, T2>
     TYPE_PARAMETER <T1>
     TYPE_PARAMETER <T2>
     CONSTRUCTOR public constructor Test1<T1, T2>(x: T1, y: T2)
@@ -33,7 +33,7 @@ FILE /constructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test2
-    $new: VALUE_PARAMETER this@Test2: Test2
+    $this: VALUE_PARAMETER this@Test2: Test2
     CONSTRUCTOR public constructor Test2(x: kotlin.Int, y: kotlin.String)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String
@@ -51,7 +51,7 @@ FILE /constructor.kt
             GET_FIELD 'y: String' type=kotlin.String origin=null
               receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null
     CLASS CLASS TestInner
-      $new: VALUE_PARAMETER this@TestInner: TestInner<Z>
+      $this: VALUE_PARAMETER this@TestInner: TestInner<Z>
       TYPE_PARAMETER <Z>
       CONSTRUCTOR public constructor TestInner<Z>(z: Z)
         $outer: VALUE_PARAMETER this@Test2: Test2
@@ -85,7 +85,7 @@ FILE /constructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test3
-    $new: VALUE_PARAMETER this@Test3: Test3
+    $this: VALUE_PARAMETER this@Test3: Test3
     CONSTRUCTOR public constructor Test3(x: kotlin.Int, y: kotlin.String = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int
       VALUE_PARAMETER value-parameter y: kotlin.String = ...
@@ -118,7 +118,7 @@ FILE /constructor.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test4
-    $new: VALUE_PARAMETER this@Test4: Test4<T>
+    $this: VALUE_PARAMETER this@Test4: Test4<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test4<T>(x: kotlin.Int)
       VALUE_PARAMETER value-parameter x: kotlin.Int

compiler/testData/ir/irText/declarations/parameters/dataClassMembers.txt

@@ -1,6 +1,6 @@
 FILE /dataClassMembers.kt
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test<T>
+    $this: VALUE_PARAMETER this@Test: Test<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Test<T>(x: T, y: kotlin.String = ...)
       VALUE_PARAMETER value-parameter x: T

compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt

@@ -21,7 +21,7 @@ FILE /defaultPropertyAccessors.kt
         SET_FIELD 'test2: Int' type=kotlin.Unit origin=null
           value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
   CLASS CLASS Host
-    $new: VALUE_PARAMETER this@Host: Host
+    $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
@@ -57,7 +57,7 @@ FILE /defaultPropertyAccessors.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS InPrimaryCtor
-    $new: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
+    $this: VALUE_PARAMETER this@InPrimaryCtor: InPrimaryCtor<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor InPrimaryCtor<T>(testInPrimaryCtor1: T, testInPrimaryCtor2: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter testInPrimaryCtor1: T

compiler/testData/ir/irText/declarations/parameters/delegatedMembers.txt

@@ -1,5 +1,6 @@
 FILE /delegatedMembers.kt
   CLASS INTERFACE IBase
+    $this: VALUE_PARAMETER this@IBase: IBase<T>
     TYPE_PARAMETER <T>
     FUN public abstract fun foo(x: kotlin.Int): kotlin.Unit
       $this: VALUE_PARAMETER this@IBase: IBase<T>
@@ -16,7 +17,7 @@ FILE /delegatedMembers.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test<TT>
+    $this: VALUE_PARAMETER this@Test: Test<TT>
     TYPE_PARAMETER <TT>
     CONSTRUCTOR public constructor Test<TT>(impl: IBase<TT>)
       VALUE_PARAMETER value-parameter impl: IBase<TT>

compiler/testData/ir/irText/declarations/parameters/fun.txt

@@ -21,7 +21,7 @@ FILE /fun.kt
     VALUE_PARAMETER value-parameter j: kotlin.String
     BLOCK_BODY
   CLASS CLASS Host
-    $new: VALUE_PARAMETER this@Host: Host
+    $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

compiler/testData/ir/irText/declarations/parameters/genericInnerClass.txt

@@ -1,13 +1,13 @@
 FILE /genericInnerClass.kt
   CLASS CLASS Outer
-    $new: VALUE_PARAMETER this@Outer: Outer<T1>
+    $this: VALUE_PARAMETER this@Outer: Outer<T1>
     TYPE_PARAMETER <T1>
     CONSTRUCTOR public constructor Outer<T1>()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Outer'
     CLASS CLASS Inner
-      $new: VALUE_PARAMETER this@Inner: Inner<T2, T1>
+      $this: VALUE_PARAMETER this@Inner: Inner<T2, T1>
       TYPE_PARAMETER <T2>
       CONSTRUCTOR public constructor Inner<T2>()
         $outer: VALUE_PARAMETER this@Outer: Outer<T1>

compiler/testData/ir/irText/declarations/parameters/propertyAccessors.txt

@@ -45,7 +45,7 @@ FILE /propertyAccessors.kt
       VALUE_PARAMETER value-parameter value: kotlin.Int
       BLOCK_BODY
   CLASS CLASS Host
-    $new: VALUE_PARAMETER this@Host: Host<T>
+    $this: VALUE_PARAMETER this@Host: Host<T>
     TYPE_PARAMETER <T>
     CONSTRUCTOR public constructor Host<T>()
       BLOCK_BODY

compiler/testData/ir/irText/declarations/primaryCtorDefaultArguments.txt

@@ -1,6 +1,6 @@
 FILE /primaryCtorDefaultArguments.kt
   CLASS CLASS Test
-    $new: VALUE_PARAMETER this@Test: Test
+    $this: VALUE_PARAMETER this@Test: Test
     CONSTRUCTOR public constructor Test(x: kotlin.Int = ...)
       VALUE_PARAMETER value-parameter x: kotlin.Int = ...
         EXPRESSION_BODY

compiler/testData/ir/irText/declarations/primaryCtorProperties.txt

@@ -1,6 +1,6 @@
 FILE /primaryCtorProperties.kt
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C(test1: kotlin.Int, test2: kotlin.Int)
       VALUE_PARAMETER value-parameter test1: kotlin.Int
       VALUE_PARAMETER value-parameter test2: kotlin.Int

compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt

@@ -1,6 +1,6 @@
 FILE /differentReceivers.kt
   CLASS CLASS MyClass
-    $new: VALUE_PARAMETER this@MyClass: MyClass
+    $this: VALUE_PARAMETER this@MyClass: MyClass
     CONSTRUCTOR public constructor MyClass(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

compiler/testData/ir/irText/declarations/provideDelegate/local.txt

@@ -1,6 +1,6 @@
 FILE /local.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER this@Delegate: Delegate
+    $this: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -28,7 +28,7 @@ FILE /local.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
+    $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.txt

@@ -1,6 +1,6 @@
 FILE /localDifferentReceivers.kt
   CLASS CLASS MyClass
-    $new: VALUE_PARAMETER this@MyClass: MyClass
+    $this: VALUE_PARAMETER this@MyClass: MyClass
     CONSTRUCTOR public constructor MyClass(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

compiler/testData/ir/irText/declarations/provideDelegate/member.txt

@@ -1,6 +1,6 @@
 FILE /member.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER this@Delegate: Delegate
+    $this: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -28,7 +28,7 @@ FILE /member.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
+    $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -57,7 +57,7 @@ FILE /member.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS Host
-    $new: VALUE_PARAMETER this@Host: Host
+    $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR public constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'

compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt

@@ -1,12 +1,12 @@
 FILE /memberExtension.kt
   CLASS OBJECT Host
-    $new: VALUE_PARAMETER this@Host: Host
+    $this: VALUE_PARAMETER this@Host: Host
     CONSTRUCTOR private constructor Host()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
         INSTANCE_INITIALIZER_CALL classDescriptor='Host'
     CLASS CLASS StringDelegate
-      $new: VALUE_PARAMETER this@StringDelegate: StringDelegate
+      $this: VALUE_PARAMETER this@StringDelegate: StringDelegate
       CONSTRUCTOR public constructor StringDelegate(s: kotlin.String)
         VALUE_PARAMETER value-parameter s: kotlin.String
         BLOCK_BODY

compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt

@@ -1,6 +1,6 @@
 FILE /topLevel.kt
   CLASS CLASS Delegate
-    $new: VALUE_PARAMETER this@Delegate: Delegate
+    $this: VALUE_PARAMETER this@Delegate: Delegate
     CONSTRUCTOR public constructor Delegate(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY
@@ -28,7 +28,7 @@ FILE /topLevel.kt
     FUN FAKE_OVERRIDE public open override fun hashCode(): kotlin.Int
     FUN FAKE_OVERRIDE public open override fun toString(): kotlin.String
   CLASS CLASS DelegateProvider
-    $new: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
+    $this: VALUE_PARAMETER this@DelegateProvider: DelegateProvider
     CONSTRUCTOR public constructor DelegateProvider(value: kotlin.String)
       VALUE_PARAMETER value-parameter value: kotlin.String
       BLOCK_BODY

compiler/testData/ir/irText/declarations/typeAlias.txt

@@ -4,7 +4,7 @@ FILE /typeAlias.kt
     BLOCK_BODY
       TYPEALIAS typealias TestLocal = String type=kotlin.String
   CLASS CLASS C
-    $new: VALUE_PARAMETER this@C: C
+    $this: VALUE_PARAMETER this@C: C
     CONSTRUCTOR public constructor C()
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'