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

Add validation for binding between java classes and corresponding package fragments

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-02-10 15:33:59 +04:00
parent e4a0221abc
commit e3ae7afac3
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java
+20
View File
@@ -21,6 +21,8 @@ import junit.framework.Assert;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor;
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassStaticsPackageFragmentDescriptor;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -179,6 +181,13 @@ public class DescriptorValidator {
public Boolean visitPackageFragmentDescriptor( public Boolean visitPackageFragmentDescriptor(
PackageFragmentDescriptor descriptor, DiagnosticCollector collector PackageFragmentDescriptor descriptor, DiagnosticCollector collector
) { ) {
if (descriptor instanceof JavaClassStaticsPackageFragmentDescriptor) {
JavaClassDescriptor correspondingClass = ((JavaClassStaticsPackageFragmentDescriptor) descriptor).getCorrespondingClass();
JavaClassStaticsPackageFragmentDescriptor correspondingPackageFragment = correspondingClass.getCorrespondingPackageFragment();
if (correspondingPackageFragment != descriptor) {
report(collector, descriptor, "Corresponding class bound to another descriptor: " + correspondingPackageFragment);
}
}
validateScope(descriptor.getMemberScope(), collector); validateScope(descriptor.getMemberScope(), collector);
return true; return true;
} }
@@ -254,6 +263,17 @@ public class DescriptorValidator {
} }
} }
if (descriptor instanceof JavaClassDescriptor) {
JavaClassStaticsPackageFragmentDescriptor
correspondingPackageFragment = ((JavaClassDescriptor) descriptor).getCorrespondingPackageFragment();
if (correspondingPackageFragment != null) {
JavaClassDescriptor correspondingClass = correspondingPackageFragment.getCorrespondingClass();
if (correspondingClass != descriptor) {
report(collector, descriptor, "Corresponding package bound to another descriptor: " + correspondingClass);
}
}
}
return true; return true;
} }