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

new scope and deserialization

Browse Source
This commit is contained in:
Michael Bogdanov
2015-08-17 14:30:42 +03:00
parent 7f2973dc7d
commit ebb1629285
6 changed files with 120 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
+33 -7
View File
@@ -48,17 +48,43 @@ public class LazyJavaPackageScope(
public val kotlinBinaryClass: KotlinJvmBinaryClass?
= c.components.kotlinClassFinder.findKotlinClass(PackageClassUtils.getPackageClassId(packageFragment.fqName))
public val kotlinBinaryClasses: List<KotlinJvmBinaryClass>
init {
val pakage = jPackage.getFqName().asString().replace('.', '/')
val files = containingDeclaration.packageMapper.findPackageMembers(pakage)
val packageClassId = PackageClassUtils.getPackageClassId(packageFragment.fqName).packageFqName
val notFound = arrayListOf<String>()
val classFiles = files.map {
val classId = ClassId(packageClassId, Name.identifierNoValidate(it.substringAfterLast("/")))
val findKotlinClass = c.components.kotlinClassFinder.findKotlinClass(classId)
if (findKotlinClass == null) {
notFound.add("$classId")
}
findKotlinClass
}
kotlinBinaryClasses = classFiles.filterNotNull()
if (kotlinBinaryClasses.size() != classFiles.size()) {
println("package: $pakage")
println("files: " + files.join())
println("not found: " + notFound.join())
//assert(kotlinBinaryClasses.size() == classFiles.size(), "${kotlinBinaryClasses.size()} != ${classFiles.size()}")
}
}
private val deserializedPackageScope = c.storageManager.createLazyValue {
val kotlinBinaryClass = kotlinBinaryClass
if (kotlinBinaryClass == null)
if (kotlinBinaryClasses.isEmpty())
JetScope.Empty
else {
val pakage = jPackage.getFqName().asString()
val files = containingDeclaration.packageMapper.findPackageMembers(pakage.replace("\\.", "/"))
// println("package:" + pakage)
// println(files.join())
val jetScope = c.components.deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinBinaryClass) ?: JetScope.Empty
jetScope
//if(!kotlinBinaryClasses.isEmpty()) {
c.components.deserializedDescriptorResolver.createKotlinNewPackageScope(packageFragment, kotlinBinaryClasses)
//print("deserializing " + packageFragment.getName())
//}
// val jetScope = c.deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinBinaryClass) ?: JetScope.Empty
// jetScope
}
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+16 -2
View File
@@ -29,15 +29,17 @@ import org.jetbrains.kotlin.serialization.PackageData;
import org.jetbrains.kotlin.serialization.deserialization.ClassDataProvider;
import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents;
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter;
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedNewPackageMemberScope;
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope;
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.CLASS;
import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.PACKAGE_FACADE;
public final class DeserializedDescriptorResolver {
private final ErrorReporter errorReporter;
@@ -67,7 +69,8 @@ public final class DeserializedDescriptorResolver {
@Nullable
public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) {
String[] data = readData(kotlinClass, PACKAGE_FACADE);
//TODO add assertion from readData(kotlinClass, CLASS);
String[] data = kotlinClass.getClassHeader().getAnnotationData();
if (data != null) {
//all classes are included in java scope
PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data);
@@ -84,6 +87,17 @@ public final class DeserializedDescriptorResolver {
return null;
}
@NotNull
public JetScope createKotlinNewPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull List<KotlinJvmBinaryClass> packageParts) {
List<JetScope> list = new ArrayList<JetScope>();
for (KotlinJvmBinaryClass callable : packageParts) {
JetScope scope = createKotlinPackageScope(descriptor, callable);
assert scope != null : "Can't create scope for " + callable;
list.add(scope);
}
return new DeserializedNewPackageMemberScope(descriptor, list);
}
@Nullable
public String[] readData(@NotNull KotlinJvmBinaryClass kotlinClass, @NotNull KotlinClassHeader.Kind expectedKind) {
KotlinClassHeader header = kotlinClass.getClassHeader();