From a82849f2894ce366ea70afd9d8079774ba2a10e6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 14 May 2014 21:13:19 +0400 Subject: [PATCH] Removed member filter from injectors. --- .../cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 2 -- .../jetbrains/jet/cli/jvm/repl/ReplInterpreter.java | 3 +-- .../jet/di/InjectorForJavaDescriptorResolver.java | 4 ---- .../jet/di/InjectorForLazyResolveWithJava.java | 4 ---- .../jet/di/InjectorForTopDownAnalyzerForJvm.java | 7 +------ .../jet/lang/resolve/java/AnalyzerFacadeForJVM.java | 7 ++----- .../jet/checkers/AbstractJetDiagnosticsTest.java | 2 -- .../jet/jvm/compiler/AbstractLoadJavaTest.java | 3 +-- .../jet/lang/resolve/lazy/JvmResolveUtil.java | 3 +-- .../jet/lang/resolve/lazy/LazyResolveTestUtil.java | 3 +-- .../resolve/kotlin/DeserializedDescriptorResolver.java | 10 ++-------- .../jet/generators/injectors/GenerateInjectors.kt | 7 ------- .../jet/plugin/caches/resolve/KotlinResolveCache.kt | 3 +-- 13 files changed, 10 insertions(+), 48 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 3544996efd2..bef2dc3ff51 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -51,7 +51,6 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.CliSourcesMemberFilter; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.jet.utils.KotlinPaths; @@ -298,7 +297,6 @@ public class KotlinToJVMBytecodeCompiler { sharedTrace, Predicates.alwaysTrue(), sharedModule, - new CliSourcesMemberFilter(environment.getSourceFiles()), environment.getConfiguration().get(JVMConfigurationKeys.MODULE_IDS), environment.getConfiguration().get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR) ); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index ef9644bbbed..cded1f35470 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -41,7 +41,6 @@ import org.jetbrains.jet.codegen.CompilationErrorHandler; import org.jetbrains.jet.codegen.KotlinCodegenFacade; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; @@ -108,7 +107,7 @@ public class ReplInterpreter { new ExceptionTracker(), // dummy Predicates.alwaysTrue() ); - injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, MemberFilter.ALWAYS_TRUE); + injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module); topDownAnalysisContext = new TopDownAnalysisContext(topDownAnalysisParameters); module.addFragmentProvider(SOURCES, injector.getTopDownAnalyzer().getPackageFragmentProvider()); module.addFragmentProvider(BUILT_INS, KotlinBuiltIns.getInstance().getBuiltInsModule().getPackageFragmentProvider()); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index c36c6e7a805..2f73d6adbc3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -30,7 +30,6 @@ import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedMethodSignatureCheck import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider; import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext; import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; @@ -59,7 +58,6 @@ public class InjectorForJavaDescriptorResolver { private final PsiBasedExternalAnnotationResolver psiBasedExternalAnnotationResolver; private final JavaPropertyInitializerEvaluatorImpl javaPropertyInitializerEvaluator; private final VirtualFileFinder virtualFileFinder; - private final MemberFilter memberFilter; private final LazyJavaPackageFragmentProvider lazyJavaPackageFragmentProvider; private final GlobalJavaResolverContext globalJavaResolverContext; private final DeserializedDescriptorResolver deserializedDescriptorResolver; @@ -89,7 +87,6 @@ public class InjectorForJavaDescriptorResolver { this.globalJavaResolverContext = new GlobalJavaResolverContext(lockBasedStorageManager, getJavaClassFinder(), virtualFileFinder, deserializedDescriptorResolver, psiBasedExternalAnnotationResolver, traceBasedExternalSignatureResolver, traceBasedErrorReporter, psiBasedMethodSignatureChecker, traceBasedJavaResolverCache, javaPropertyInitializerEvaluator); this.lazyJavaPackageFragmentProvider = new LazyJavaPackageFragmentProvider(globalJavaResolverContext, getModule()); this.javaDescriptorResolver = new JavaDescriptorResolver(lazyJavaPackageFragmentProvider, getModule()); - this.memberFilter = org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter.ALWAYS_TRUE; this.descriptorDeserializers = new DescriptorDeserializers(); this.annotationDescriptorDeserializer = new AnnotationDescriptorDeserializer(); this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(lockBasedStorageManager); @@ -112,7 +109,6 @@ public class InjectorForJavaDescriptorResolver { deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); - deserializedDescriptorResolver.setMemberFilter(memberFilter); deserializedDescriptorResolver.setStorageManager(lockBasedStorageManager); descriptorDeserializers.setAnnotationDescriptorDeserializer(annotationDescriptorDeserializer); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java index fe64f388414..4073d7ee699 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver; import org.jetbrains.jet.lang.resolve.java.resolver.LazyResolveBasedCache; @@ -77,7 +76,6 @@ public class InjectorForLazyResolveWithJava { private final ResolveSession resolveSession; private final JavaDescriptorResolver javaDescriptorResolver; private final VirtualFileFinder virtualFileFinder; - private final MemberFilter memberFilter; private final JavaClassFinderImpl javaClassFinder; private final TraceBasedExternalSignatureResolver traceBasedExternalSignatureResolver; private final LazyResolveBasedCache lazyResolveBasedCache; @@ -138,7 +136,6 @@ public class InjectorForLazyResolveWithJava { this.globalJavaResolverContext = new GlobalJavaResolverContext(lockBasedStorageManager, javaClassFinder, virtualFileFinder, deserializedDescriptorResolver, psiBasedExternalAnnotationResolver, traceBasedExternalSignatureResolver, traceBasedErrorReporter, psiBasedMethodSignatureChecker, lazyResolveBasedCache, javaPropertyInitializerEvaluator); this.lazyJavaPackageFragmentProvider = new LazyJavaPackageFragmentProvider(globalJavaResolverContext, getModule()); this.javaDescriptorResolver = new JavaDescriptorResolver(lazyJavaPackageFragmentProvider, getModule()); - this.memberFilter = org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter.ALWAYS_TRUE; this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); this.argumentTypeResolver = new ArgumentTypeResolver(); @@ -242,7 +239,6 @@ public class InjectorForLazyResolveWithJava { deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); - deserializedDescriptorResolver.setMemberFilter(memberFilter); deserializedDescriptorResolver.setStorageManager(lockBasedStorageManager); descriptorDeserializers.setAnnotationDescriptorDeserializer(annotationDescriptorDeserializer); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 452b685e2fc..44164928dfe 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializers; import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; @@ -86,7 +85,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final TopDownAnalyzer topDownAnalyzer; private final LazyTopDownAnalyzer lazyTopDownAnalyzer; private final MutablePackageFragmentProvider mutablePackageFragmentProvider; - private final MemberFilter memberFilter; private final JavaDescriptorResolver javaDescriptorResolver; private final DescriptorDeserializers descriptorDeserializers; private final JavaClassFinderImpl javaClassFinder; @@ -136,8 +134,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly @NotNull Project project, @NotNull GlobalContext globalContext, @NotNull BindingTrace bindingTrace, - @NotNull ModuleDescriptor moduleDescriptor, - @NotNull MemberFilter memberFilter + @NotNull ModuleDescriptor moduleDescriptor ) { this.project = project; this.globalContext = globalContext; @@ -148,7 +145,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.topDownAnalyzer = new TopDownAnalyzer(); this.lazyTopDownAnalyzer = new LazyTopDownAnalyzer(); this.mutablePackageFragmentProvider = new MutablePackageFragmentProvider(getModuleDescriptor()); - this.memberFilter = memberFilter; this.javaClassFinder = new JavaClassFinderImpl(); this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder.SERVICE.getInstance(project); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(); @@ -327,7 +323,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); - deserializedDescriptorResolver.setMemberFilter(memberFilter); deserializedDescriptorResolver.setStorageManager(storageManager); annotationDescriptorDeserializer.setClassResolver(javaDescriptorResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index d20b4cda8ef..5bd9b739ea5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.analyzer.AnalyzerFacade; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.di.InjectorForLazyResolveWithJava; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.jet.lang.descriptors.DependencyKind; @@ -130,9 +129,8 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { BindingTrace trace, Predicate filesToAnalyzeCompletely, ModuleDescriptorImpl module, - MemberFilter memberFilter, List moduleIds, - File incrementalCacheDir + File incrementalCacheDir ) { GlobalContext globalContext = ContextPackage.GlobalContext(); TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create( @@ -143,8 +141,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { false ); - InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module, - memberFilter); + InjectorForTopDownAnalyzerForJvm injector = new InjectorForTopDownAnalyzerForJvm(project, topDownAnalysisParameters, trace, module); try { module.addFragmentProvider(DependencyKind.BINARIES, injector.getJavaDescriptorResolver().getPackageFragmentProvider()); diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index b7451a0bfcb..49a9d7dbcf2 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -26,7 +26,6 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.descriptors.DependencyKind; import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl; import org.jetbrains.jet.lang.diagnostics.*; @@ -86,7 +85,6 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { moduleTrace, Predicates.alwaysTrue(), module == null ? support.getModule() : module, - MemberFilter.ALWAYS_TRUE, null, null ); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index ed9b8c8b6ec..9d2b73281d7 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -168,8 +168,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { environment.getProject(), parameters, trace, - module, - MemberFilter.ALWAYS_TRUE); + module); module.addFragmentProvider(DependencyKind.BINARIES, injectorForAnalyzer.getJavaDescriptorResolver().getPackageFragmentProvider()); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 8801f15395e..6b9a79e0f11 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -22,7 +22,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalyzeExhaust; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTraceContext; @@ -76,6 +75,6 @@ public class JvmResolveUtil { return AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(project, files, bindingTraceContext, filesToAnalyzeCompletely, AnalyzerFacadeForJVM.createJavaModule(""), - MemberFilter.ALWAYS_TRUE, null, null); + null, null); } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index e57cabc1725..ed8b7f4dc8b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.jet.lang.descriptors.DependencyKind; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -56,7 +55,7 @@ public class LazyResolveTestUtil { ModuleDescriptorImpl sharedModule = support.getModule(); InjectorForTopDownAnalyzerForJvm injector = - new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, sharedTrace, sharedModule, MemberFilter.ALWAYS_TRUE); + new InjectorForTopDownAnalyzerForJvm(environment.getProject(), params, sharedTrace, sharedModule); sharedModule.addFragmentProvider(DependencyKind.BINARIES, injector.getJavaDescriptorResolver().getPackageFragmentProvider()); injector.getTopDownAnalyzer().analyzeFiles(params, files); return injector.getModuleDescriptor(); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java index 22a47b0f70b..63ec8f213c1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java @@ -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; } diff --git a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt index 5fc02344bc6..51e5dcd53c3 100644 --- a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt @@ -33,7 +33,6 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices import org.jetbrains.jet.di.* import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils -import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter import org.jetbrains.jet.lang.resolve.calls.CallResolver import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializers @@ -98,8 +97,6 @@ private fun generatorForTopDownAnalyzerForJvm() = implementInterface(javaClass()) commonForTopDownAnalyzer() - parameter(javaClass()) - publicField(javaClass()) publicField(javaClass()) @@ -140,8 +137,6 @@ private fun generatorForJavaDescriptorResolver() = ) field(javaClass(), init = GivenExpression(javaClass().getName() + ".SERVICE.getInstance(project)")) - field(javaClass(), - init = GivenExpression(javaClass().getName() + ".ALWAYS_TRUE")) } private fun generatorForLazyResolveWithJava() = @@ -162,8 +157,6 @@ private fun generatorForLazyResolveWithJava() = field(javaClass(), init = GivenExpression(javaClass().getName() + ".SERVICE.getInstance(project)")) - field(javaClass(), - init = GivenExpression(javaClass().getName() + ".ALWAYS_TRUE")) fields( javaClass(), javaClass(), diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index 83294b9f545..420bc9495c4 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -249,8 +249,7 @@ private object KotlinResolveDataProvider { project, SimpleGlobalContext(resolveSession.getStorageManager(), resolveSession.getExceptionTracker()), trace, - resolveSession.getModuleDescriptor(), - MemberFilter.ALWAYS_TRUE + resolveSession.getModuleDescriptor() ) injector.getLazyTopDownAnalyzer()!!.analyzeDeclarations( resolveSession,