From de7b93c4b802eece650c59081bbcee60e14dd2b0 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 11 Jul 2012 20:49:30 +0400 Subject: [PATCH] Class object resolution scope should not have an implicit receiver See testData/diagnostics/test/ClassObjectCannotAccessClassFields.kt test --- .../lang/resolve/scopes/InnerClassesScopeWrapper.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java index 433f6f0d088..744811a42cf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java @@ -85,11 +85,16 @@ public class InnerClassesScopeWrapper extends JetScopeImpl { @NotNull @Override public ReceiverDescriptor getImplicitReceiver() { - return actualScope.getImplicitReceiver(); + return ReceiverDescriptor.NO_RECEIVER; } @Override public void getImplicitReceiversHierarchy(@NotNull List result) { - actualScope.getImplicitReceiversHierarchy(result); + // Do nothing + } + + @Override + public String toString() { + return "Classes from " + actualScope; } }