From 9a04ff0b9e67ba5575af70e7b11820d15c07f041 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 10 Nov 2014 18:37:59 +0300 Subject: [PATCH] Test order of nested/inner classes for deserialized classes --- .../jet/jvm/compiler/DeserializedScopeValidationVisitor.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt index 63c1db75ece..b9327bb0d02 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -27,6 +27,7 @@ import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.test.util.DescriptorValidator import org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor +import org.jetbrains.jet.lang.descriptors.ClassDescriptor class DeserializedScopeValidationVisitor : DescriptorValidator.ValidationVisitor() { override fun validateScope(scope: JetScope, collector: DescriptorValidator.DiagnosticCollector) { @@ -39,7 +40,7 @@ private fun validateDeserializedScope(scope: JetScope) { val isPackageViewScope = scope.safeGetContainingDeclaration() is PackageViewDescriptor if (scope is DeserializedMemberScope || isPackageViewScope) { val relevantDescriptors = scope.getAllDescriptors().filter { member -> - member is CallableMemberDescriptor && member.getKind().isReal() + member is CallableMemberDescriptor && member.getKind().isReal() || (!isPackageViewScope && member is ClassDescriptor) } checkSorted(relevantDescriptors, scope.getContainingDeclaration()) }