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

Got rid of redundant constructor.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-05-14 21:19:57 +04:00
parent a82849f289
commit 4cf2dc665e
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.java
+1 -1
View File
@@ -54,7 +54,7 @@ class BuiltinsPackageFragment extends PackageFragmentDescriptorImpl {
// TODO: support annotations
members = new DeserializedPackageMemberScope(storageManager, this, Deserializers.UNSUPPORTED, MemberFilter.ALWAYS_TRUE,
new BuiltInsDescriptorFinder(storageManager), loadPackage(), nameResolver);
new BuiltInsDescriptorFinder(storageManager), new PackageData(nameResolver, loadPackage()));
}
@NotNull
core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+5 -18
View File
@@ -37,22 +37,6 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
private final FqName packageFqName;
public DeserializedPackageMemberScope(
@NotNull StorageManager storageManager,
@NotNull PackageFragmentDescriptor packageDescriptor,
@NotNull Deserializers deserializers,
@NotNull MemberFilter memberFilter,
@NotNull DescriptorFinder descriptorFinder,
@NotNull ProtoBuf.Package proto,
@NotNull NameResolver nameResolver
) {
super(storageManager, packageDescriptor,
DescriptorDeserializer.create(storageManager, packageDescriptor, nameResolver, descriptorFinder, deserializers),
getFilteredMembers(packageDescriptor, proto, memberFilter, nameResolver));
this.descriptorFinder = descriptorFinder;
this.packageFqName = packageDescriptor.getFqName();
}
public DeserializedPackageMemberScope(
@NotNull StorageManager storageManager,
@NotNull PackageFragmentDescriptor packageDescriptor,
@@ -61,8 +45,11 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
@NotNull DescriptorFinder descriptorFinder,
@NotNull PackageData packageData
) {
this(storageManager, packageDescriptor, deserializers, memberFilter, descriptorFinder, packageData.getPackageProto(),
packageData.getNameResolver());
super(storageManager, packageDescriptor,
DescriptorDeserializer.create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializers),
getFilteredMembers(packageDescriptor, packageData.getPackageProto(), memberFilter, packageData.getNameResolver()));
this.descriptorFinder = descriptorFinder;
this.packageFqName = packageDescriptor.getFqName();
}
@Nullable