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

Renamed class

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-14 22:26:22 +03:00
parent a740b60134
commit 867b0b5075
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
+3 -3
View File
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct
import org.jetbrains.kotlin.resolve.lazy.FileScopeProviderImpl import org.jetbrains.kotlin.resolve.lazy.FileScopeProviderImpl
import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory 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) { public fun StorageComponentContainer.configureJavaTopDownAnalysis(moduleContentScope: GlobalSearchScope, project: Project) {
useInstance(moduleContentScope) useInstance(moduleContentScope)
@@ -75,7 +75,7 @@ public fun createContainerForLazyResolveWithJava(
configureModule(moduleContext, KotlinJvmCheckerProvider(moduleContext.module), bindingTrace) configureModule(moduleContext, KotlinJvmCheckerProvider(moduleContext.module), bindingTrace)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project) configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project)
useImpl<AdditionalScopesWithSyntheticExtensions>() useImpl<AdditionalScopesWithJavaSyntheticExtensions>()
useInstance(moduleClassResolver) useInstance(moduleClassResolver)
useInstance(declarationProviderFactory) useInstance(declarationProviderFactory)
@@ -97,7 +97,7 @@ public fun createContainerForTopDownAnalyzerForJvm(
configureModule(moduleContext, KotlinJvmCheckerProvider(moduleContext.module), bindingTrace) configureModule(moduleContext, KotlinJvmCheckerProvider(moduleContext.module), bindingTrace)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project) configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project)
useImpl<AdditionalScopesWithSyntheticExtensions>() useImpl<AdditionalScopesWithJavaSyntheticExtensions>()
useInstance(declarationProviderFactory) useInstance(declarationProviderFactory)
useInstance(BodyResolveCache.ThrowException) useInstance(BodyResolveCache.ThrowException)
compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaBeansExtensionsScope.kt
+1 -1
View File
@@ -72,7 +72,7 @@ interface SyntheticJavaBeansPropertyDescriptor : PropertyDescriptor {
} }
} }
class AdditionalScopesWithSyntheticExtensions(storageManager: StorageManager) : FileScopeProvider.AdditionalScopes() { class AdditionalScopesWithJavaSyntheticExtensions(storageManager: StorageManager) : FileScopeProvider.AdditionalScopes() {
private val scope = JavaBeansExtensionsScope(storageManager) private val scope = JavaBeansExtensionsScope(storageManager)
override fun scopes(file: JetFile) = listOf(scope) override fun scopes(file: JetFile) = listOf(scope)