From 04569dd4af78491cfb16cc0b4b2b8edca1c4e8d7 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 17 Nov 2015 12:18:51 +0300
Subject: [PATCH] Rename: ExpressionOrImplicitClassReceiver --->
 ThisClassReceiver

---
 .../kotlin/resolve/scopes/receivers/ExpressionReceiver.kt  | 2 +-
 .../src/org/jetbrains/kotlin/descriptors/Visibilities.java | 6 +++---
 .../kotlin/resolve/scopes/receivers/ClassReceiver.kt       | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.kt
index aa8d177ea55..0e72e045261 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.kt
@@ -38,7 +38,7 @@ interface ExpressionReceiver :  ReceiverValue {
                 override val classDescriptor: ClassDescriptor,
                 expression: KtExpression,
                 type: KotlinType
-        ) : ExpressionReceiverImpl(expression, type), ExpressionOrImplicitClassReceiver
+        ) : ExpressionReceiverImpl(expression, type), ThisClassReceiver
 
         fun create(
                 expression: KtExpression,
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
index a8598e5b824..cfb3451af38 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
-import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionOrImplicitClassReceiver;
+import org.jetbrains.kotlin.resolve.scopes.receivers.ThisClassReceiver;
 import org.jetbrains.kotlin.util.ModuleVisibilityHelper;
 import org.jetbrains.kotlin.utils.CollectionsKt;
 
@@ -76,8 +76,8 @@ public class Visibilities {
             if (PRIVATE.isVisible(thisObject, what, from)) {
                 DeclarationDescriptor classDescriptor = DescriptorUtils.getParentOfType(what, ClassDescriptor.class);
 
-                if (classDescriptor != null && thisObject instanceof ExpressionOrImplicitClassReceiver) {
-                    return ((ExpressionOrImplicitClassReceiver) thisObject).getClassDescriptor().getOriginal().equals(classDescriptor.getOriginal());
+                if (classDescriptor != null && thisObject instanceof ThisClassReceiver) {
+                    return ((ThisClassReceiver) thisObject).getClassDescriptor().getOriginal().equals(classDescriptor.getOriginal());
                 }
             }
             return false;
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.kt
index e5abd10267d..8f77aec939a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.kt
@@ -18,11 +18,14 @@ package org.jetbrains.kotlin.resolve.scopes.receivers
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 
-interface ExpressionOrImplicitClassReceiver : ReceiverValue {
+/**
+ * Describes any "this" receiver inside a class
+ */
+interface ThisClassReceiver : ReceiverValue {
     val classDescriptor: ClassDescriptor
 }
 
-open class ClassReceiver(override val classDescriptor: ClassDescriptor) : ExpressionOrImplicitClassReceiver, ImplicitReceiver {
+open class ClassReceiver(override val classDescriptor: ClassDescriptor) : ThisClassReceiver, ImplicitReceiver {
 
     override fun exists() = true