azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test order of nested/inner classes for deserialized classes

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-10 18:37:59 +03:00
parent 52f7999bee
commit 9a04ff0b9e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt
+2 -1
View File
@@ -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
import org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor import org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor
import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
class DeserializedScopeValidationVisitor : DescriptorValidator.ValidationVisitor() { class DeserializedScopeValidationVisitor : DescriptorValidator.ValidationVisitor() {
override fun validateScope(scope: JetScope, collector: DescriptorValidator.DiagnosticCollector) { override fun validateScope(scope: JetScope, collector: DescriptorValidator.DiagnosticCollector) {
@@ -39,7 +40,7 @@ private fun validateDeserializedScope(scope: JetScope) {
val isPackageViewScope = scope.safeGetContainingDeclaration() is PackageViewDescriptor val isPackageViewScope = scope.safeGetContainingDeclaration() is PackageViewDescriptor
if (scope is DeserializedMemberScope || isPackageViewScope) { if (scope is DeserializedMemberScope || isPackageViewScope) {
val relevantDescriptors = scope.getAllDescriptors().filter { member -> 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()) checkSorted(relevantDescriptors, scope.getContainingDeclaration())
} }