From c2598faa4ee7f9ae7a3036d83d1ac0cb09ef91a5 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 22 Nov 2013 17:03:34 +0400
Subject: [PATCH] Fix class object visibility check

ExpressionTypingContext now has a scope for visibility checking, which isn't
replaced on replaceScope()
---
 .../lang/resolve/calls/CallExpressionResolver.java    |  2 +-
 .../types/expressions/ExpressionTypingContext.java    | 11 +++++++----
 .../classObjects/nestedClassInPrivateClassObject.kt   |  4 ++--
 .../tests/enum/classObjectOfPrivateEnum.kt            |  9 +++++++++
 .../jet/checkers/JetDiagnosticsTestGenerated.java     |  5 +++++
 5 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
index 92639707826..315b68fda55 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
@@ -139,7 +139,7 @@ public class CallExpressionResolver {
         if (!(classifier instanceof ClassDescriptor)) return;
         ClassDescriptor classObject = ((ClassDescriptor) classifier).getClassObjectDescriptor();
         assert classObject != null : "This check should be done only for classes with class objects: " + classifier;
-        DeclarationDescriptor from = context.scope.getContainingDeclaration();
+        DeclarationDescriptor from = context.scopeForVisibility.getContainingDeclaration();
         if (!Visibilities.isVisible(classObject, from)) {
             context.trace.report(INVISIBLE_MEMBER.on(expression, classObject, classObject.getVisibility(), from));
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
index 754788d59a4..1487a06d97b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
@@ -69,12 +69,12 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
             @NotNull CallResolverExtension callResolverExtension,
             boolean isAnnotationContext
     ) {
-        return new ExpressionTypingContext(expressionTypingServices, labelResolver, trace, scope, dataFlowInfo, expectedType,
+        return new ExpressionTypingContext(expressionTypingServices, labelResolver, trace, scope, scope, dataFlowInfo, expectedType,
                                            contextDependency, resolutionResultsCache, callResolverExtension, isAnnotationContext);
     }
 
     public final ExpressionTypingServices expressionTypingServices;
-
+    public final JetScope scopeForVisibility;
     private CompileTimeConstantResolver compileTimeConstantResolver;
 
     private ExpressionTypingContext(
@@ -82,6 +82,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
             @NotNull LabelResolver labelResolver,
             @NotNull BindingTrace trace,
             @NotNull JetScope scope,
+            @NotNull JetScope scopeForVisibility,
             @NotNull DataFlowInfo dataFlowInfo,
             @NotNull JetType expectedType,
             @NotNull ContextDependency contextDependency,
@@ -92,6 +93,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
         super(trace, scope, expectedType, dataFlowInfo, contextDependency, resolutionResultsCache, labelResolver, callResolverExtension,
               isAnnotationContext);
         this.expressionTypingServices = expressionTypingServices;
+        this.scopeForVisibility = scopeForVisibility;
     }
 
     @Override
@@ -104,8 +106,9 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
             @NotNull ResolutionResultsCache resolutionResultsCache,
             @NotNull LabelResolver labelResolver
     ) {
-        return new ExpressionTypingContext(expressionTypingServices, this.labelResolver, trace, scope, dataFlowInfo, expectedType,
-                                           contextDependency, resolutionResultsCache, callResolverExtension, isAnnotationContext);
+        return new ExpressionTypingContext(expressionTypingServices, this.labelResolver, trace, scope, scopeForVisibility, dataFlowInfo,
+                                           expectedType, contextDependency, resolutionResultsCache, callResolverExtension,
+                                           isAnnotationContext);
     }
 
     @Override
diff --git a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
index dafa3f1d71d..0bc858ff428 100644
--- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
@@ -10,6 +10,6 @@ class A {
     }
 }
 
-fun f1() = <!INVISIBLE_MEMBER!>A<!>.B.C
+fun f1() = <!INVISIBLE_MEMBER!>A<!>.B.<!INVISIBLE_MEMBER!>C<!>
 
-fun f2() = <!INVISIBLE_MEMBER!>A<!>.B.C.<!INVISIBLE_MEMBER!>foo<!>()
+fun f2() = <!INVISIBLE_MEMBER!>A<!>.B.<!INVISIBLE_MEMBER!>C<!>.<!INVISIBLE_MEMBER!>foo<!>()
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt b/compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt
new file mode 100644
index 00000000000..959b09adc52
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt
@@ -0,0 +1,9 @@
+// FILE: 1.kt
+package a
+
+private enum class E { ENTRY }
+
+// FILE: 2.kt
+package b
+
+val e = a.<!INVISIBLE_MEMBER!>E<!>
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index d499806d223..dc25ba44ecc 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -2532,6 +2532,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/enum"), Pattern.compile("^(.+)\\.kt$"), true);
             }
             
+            @TestMetadata("classObjectOfPrivateEnum.kt")
+            public void testClassObjectOfPrivateEnum() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt");
+            }
+            
             @TestMetadata("dontCreateNamespaceTypeForEnumEntry.kt")
             public void testDontCreateNamespaceTypeForEnumEntry() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/enum/dontCreateNamespaceTypeForEnumEntry.kt");