Refactor JDR: add explicit binding between java classes and packages for their statics

Get rid of Kind in JavaPackageFragmentDescriptor and create subclass which exposes additional function
Add method in JavaClassDescriptor to get correponding package fragment
Remove JavaDescriptorResolver from context
This commit is contained in:
Pavel V. Talanov
2014-02-07 20:01:28 +04:00
parent 00a5e7ab15
commit cd6a71ef81
13 changed files with 71 additions and 115 deletions
@@ -313,7 +313,7 @@ private fun staticMembers(context: JetExpression, expectedType: JetType, resolve
}
if (classDescriptor is JavaClassDescriptor) {
val pseudoPackage = DescriptorResolverUtils.getPackageForCorrespondingJavaClass(classDescriptor)
val pseudoPackage = classDescriptor.getCorrespondingPackageFragment()
if (pseudoPackage != null) {
pseudoPackage.getMemberScope().getAllDescriptors().filterTo(descriptors, isSuitableCallable)
}