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

Get rid of DeserializedNewPackageMemberScope.kt

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-04 15:59:40 +03:00
parent cbe42aa0a2
commit 466b535ba9
4 changed files with 14 additions and 69 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
+1 -1
View File
@@ -62,7 +62,7 @@ public class LazyJavaPackageScope(
if (kotlinBinaryClasses().isEmpty())
JetScope.Empty
else {
c.components.deserializedDescriptorResolver.createKotlinNewPackageScope(packageFragment, kotlinBinaryClasses())
c.components.deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinBinaryClasses())
}
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+5 -5
View File
@@ -23,13 +23,13 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor;
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.scopes.ChainedScope;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.serialization.ClassData;
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;
@@ -68,7 +68,7 @@ public final class DeserializedDescriptorResolver {
}
@Nullable
public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) {
public JetScope createKotlinPackagePartScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) {
String[] data = readData(kotlinClass, KotlinClassHeader.Kind.FILE_FACADE);
if (data != null) {
//all classes are included in java scope
@@ -87,10 +87,10 @@ public final class DeserializedDescriptorResolver {
}
@NotNull
public JetScope createKotlinNewPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull List<KotlinJvmBinaryClass> packageParts) {
public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull List<KotlinJvmBinaryClass> packageParts) {
List<JetScope> list = new ArrayList<JetScope>();
for (KotlinJvmBinaryClass callable : packageParts) {
JetScope scope = createKotlinPackageScope(descriptor, callable);
JetScope scope = createKotlinPackagePartScope(descriptor, callable);
if (scope != null) {
list.add(scope);
}
@@ -98,7 +98,7 @@ public final class DeserializedDescriptorResolver {
if (list.isEmpty()) {
return JetScope.Empty.INSTANCE$;
}
return new DeserializedNewPackageMemberScope(descriptor, list);
return new ChainedScope(descriptor, "Member scope for union of package parts data", list.toArray(new JetScope[list.size()]));
}
@Nullable