From 214abea4d63b0018ae9edb333770c63ab54b1acd Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 30 Sep 2016 14:43:12 +0300 Subject: [PATCH] Minor, introduce DeclarationProviderFactory.EMPTY --- .../lazy/declarations/DeclarationProviderFactory.java | 6 ++++++ .../AdditionalBuiltInsMembersSignatureListsTest.kt | 9 +++------ .../kotlin/serialization/AbstractLocalClassProtoTest.kt | 7 +++---- .../builtins/AbstractBuiltInsWithJDKMembersTest.kt | 9 +++------ 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java index 655064e6ca6..207e5ad5ceb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java @@ -21,8 +21,14 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; + +import java.util.Collections; public interface DeclarationProviderFactory { + DeclarationProviderFactory EMPTY = + new FileBasedDeclarationProviderFactory(LockBasedStorageManager.NO_LOCKS, Collections.emptyList()); + @NotNull ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull KtClassLikeInfo classLikeInfo); diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt index fdf1dc1f3ed..c95f151c33d 100644 --- a/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt +++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyPublicApi import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory +import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils @@ -49,12 +49,9 @@ class AdditionalBuiltInsMembersSignatureListsTest : KotlinTestWithEnvironment() val jvmBuiltIns = JvmBuiltIns(LockBasedStorageManager.NO_LOCKS) val emptyModule = KotlinTestUtils.createEmptyModule("", JvmPlatform, jvmBuiltIns) - val moduleContext = ModuleContext(emptyModule, environment.project) - val providerFactory = FileBasedDeclarationProviderFactory(moduleContext.storageManager, emptyList()) - val container = createContainerForTopDownSingleModuleAnalyzerForJvm( - moduleContext, CliLightClassGenerationSupport.CliBindingTrace(), providerFactory, - GlobalSearchScope.allScope(environment.project), PackagePartProvider.Empty + ModuleContext(emptyModule, environment.project), CliLightClassGenerationSupport.CliBindingTrace(), + DeclarationProviderFactory.EMPTY, GlobalSearchScope.allScope(environment.project), PackagePartProvider.Empty ) emptyModule.initialize(container.get().packageFragmentProvider) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index 2ce24f2b7e2..f7264c642f8 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.load.java.structure.reflect.classId import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM -import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory +import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.test.* import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator import java.io.File @@ -57,11 +57,10 @@ abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir) val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, configuration) - val providerFactory = FileBasedDeclarationProviderFactory(moduleContext.storageManager, emptyList()) val container = createContainerForTopDownSingleModuleAnalyzerForJvm( - moduleContext, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), - providerFactory, GlobalSearchScope.allScope(environment.project), PackagePartProvider.Empty + moduleContext, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(), DeclarationProviderFactory.EMPTY, + GlobalSearchScope.allScope(environment.project), PackagePartProvider.Empty ) moduleContext.initializeModuleContents(container.get().packageFragmentProvider) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt index 1f7bff9b5eb..b4021cfbc49 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory +import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils @@ -57,12 +57,9 @@ abstract class AbstractBuiltInsWithJDKMembersTest : KotlinTestWithEnvironment() val jvmBuiltIns = JvmBuiltIns(LockBasedStorageManager.NO_LOCKS) val emptyModule = KotlinTestUtils.createEmptyModule("", JvmPlatform, jvmBuiltIns) - val moduleContext = ModuleContext(emptyModule, environment.project) - val providerFactory = FileBasedDeclarationProviderFactory(moduleContext.storageManager, emptyList()) - val container = createContainerForTopDownSingleModuleAnalyzerForJvm( - moduleContext, CliLightClassGenerationSupport.CliBindingTrace(), providerFactory, - GlobalSearchScope.allScope(environment.project), PackagePartProvider.Empty + ModuleContext(emptyModule, environment.project), CliLightClassGenerationSupport.CliBindingTrace(), + DeclarationProviderFactory.EMPTY, GlobalSearchScope.allScope(environment.project), PackagePartProvider.Empty ) emptyModule.initialize(container.get().packageFragmentProvider)