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

Removed member filter from injectors.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-05-14 21:13:19 +04:00
parent ca1ee69e4c
commit a82849f289
13 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+2 -8
View File
@@ -46,8 +46,6 @@ import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kin
public final class DeserializedDescriptorResolver {
private DescriptorDeserializers deserializers;
private MemberFilter memberFilter;
private StorageManager storageManager;
private JavaPackageFragmentProvider javaPackageFragmentProvider;
@@ -76,11 +74,6 @@ public final class DeserializedDescriptorResolver {
this.deserializers = deserializers;
}
@Inject
public void setMemberFilter(MemberFilter memberFilter) {
this.memberFilter = memberFilter;
}
@Inject
public void setJavaPackageFragmentProvider(JavaPackageFragmentProvider javaPackageFragmentProvider) {
this.javaPackageFragmentProvider = javaPackageFragmentProvider;
@@ -117,7 +110,8 @@ public final class DeserializedDescriptorResolver {
String[] data = readData(kotlinClass, PACKAGE_FACADE);
if (data != null) {
return new DeserializedPackageMemberScope(storageManager, descriptor, deserializers,
memberFilter, javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data));
MemberFilter.ALWAYS_TRUE,
javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data));
}
return null;
}