From 867b0b5075149ce57a333d2dba62d22bdffc514d Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 14 Jul 2015 22:26:22 +0300 Subject: [PATCH] Renamed class --- .../src/org/jetbrains/kotlin/frontend/java/di/injection.kt | 6 +++--- .../jetbrains/kotlin/synthetic/JavaBeansExtensionsScope.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt index 5f27659b0f5..2f671afa407 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct import org.jetbrains.kotlin.resolve.lazy.FileScopeProviderImpl import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory -import org.jetbrains.kotlin.synthetic.AdditionalScopesWithSyntheticExtensions +import org.jetbrains.kotlin.synthetic.AdditionalScopesWithJavaSyntheticExtensions public fun StorageComponentContainer.configureJavaTopDownAnalysis(moduleContentScope: GlobalSearchScope, project: Project) { useInstance(moduleContentScope) @@ -75,7 +75,7 @@ public fun createContainerForLazyResolveWithJava( configureModule(moduleContext, KotlinJvmCheckerProvider(moduleContext.module), bindingTrace) configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project) - useImpl() + useImpl() useInstance(moduleClassResolver) useInstance(declarationProviderFactory) @@ -97,7 +97,7 @@ public fun createContainerForTopDownAnalyzerForJvm( configureModule(moduleContext, KotlinJvmCheckerProvider(moduleContext.module), bindingTrace) configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project) - useImpl() + useImpl() useInstance(declarationProviderFactory) useInstance(BodyResolveCache.ThrowException) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaBeansExtensionsScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaBeansExtensionsScope.kt index 5834b3c763e..3c019f06ba5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaBeansExtensionsScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaBeansExtensionsScope.kt @@ -72,7 +72,7 @@ interface SyntheticJavaBeansPropertyDescriptor : PropertyDescriptor { } } -class AdditionalScopesWithSyntheticExtensions(storageManager: StorageManager) : FileScopeProvider.AdditionalScopes() { +class AdditionalScopesWithJavaSyntheticExtensions(storageManager: StorageManager) : FileScopeProvider.AdditionalScopes() { private val scope = JavaBeansExtensionsScope(storageManager) override fun scopes(file: JetFile) = listOf(scope)