interpret class in class object as static nested class

removed hack in TaskPrioritizer for import class from class object

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java

@@ -43,7 +43,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject;
 import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.isOrOverridesSynthesized;
 import static org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.*;
 import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER;
@@ -322,22 +321,6 @@ public class TaskPrioritizer {
                 }
             }
         }
-        if (receiverParameters.size() == 1 && !receiverParameters.iterator().next().exists()) {
-            for (D descriptor : descriptors) {
-                if (descriptor.getExpectedThisObject() != null && descriptor.getReceiverParameter() == null) {
-                    DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
-                    if (descriptor instanceof ConstructorDescriptor) {
-                        containingDeclaration = containingDeclaration.getContainingDeclaration();
-                    }
-                    if (containingDeclaration != null && isClassObject(containingDeclaration)) {
-                        ResolutionCandidate<D> candidate = ResolutionCandidate.create(descriptor);
-                        candidate.setThisObject(((ClassDescriptor) containingDeclaration).getThisAsReceiverParameter().getValue());
-                        candidate.setExplicitReceiverKind(ExplicitReceiverKind.NO_EXPLICIT_RECEIVER);
-                        result.add(candidate);
-                    }
-                }
-            }
-        }
         return result;
     }
 

compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt

@@ -0,0 +1,11 @@
+package f
+
+import f.A.B
+
+class A {
+    class object {
+        class B
+    }
+}
+
+fun test() = B()

compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt

@@ -21,4 +21,4 @@ fun f1() = ENTRY
 fun f2() = ANOTHER
 fun f3() = Nested()
 fun f4() = Nested.foo()
-fun f5() = values()
+fun f5() = <!UNRESOLVED_REFERENCE!>values<!>()

compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java

@@ -1374,6 +1374,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt");
             }
             
+            @TestMetadata("importClassInClassObject.kt")
+            public void testImportClassInClassObject() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt");
+            }
+            
             @TestMetadata("InnerClassClassObject.kt")
             public void testInnerClassClassObject() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt");

core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

@@ -432,8 +432,7 @@ public class DescriptorUtils {
         DeclarationDescriptor containing = descriptor.getContainingDeclaration();
         return descriptor instanceof ClassDescriptor &&
                containing instanceof ClassDescriptor &&
-               !((ClassDescriptor) descriptor).isInner() &&
-               !((ClassDescriptor) containing).getKind().isSingleton();
+               !((ClassDescriptor) descriptor).isInner();
     }
 
     @Nullable

idea/testData/editor/optimizeImports/Kt2709.kt

@@ -6,6 +6,6 @@ fun main() {
 
 class MyClass {
     class object {
-        public val TEST: String = ""
+        object TEST {}
     }
 }

idea/testData/editor/optimizeImports/Kt2709_after.kt

@@ -6,6 +6,6 @@ fun main() {
 
 class MyClass {
     class object {
-        public val TEST: String = ""
+        object TEST {}
     }
 }