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

Refactor: Remove ScopeProvider, introduce FileScopeProviderImpl

Browse Source 
Rename NoFileScopeProvider -> FileScopeProvider.ThrowException, ScopeProvider.AdditionalScopeProvider -> FileScopeProvider.AdditionalScopes
This commit is contained in:
Pavel V. Talanov
2015-06-29 17:34:38 +03:00
parent 7bcc3dd875
commit b173f96505
23 changed files with 154 additions and 221 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
@@ -39,8 +39,8 @@ import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzerForTopLevel
import org.jetbrains.kotlin.resolve.jvm.JavaClassFinderPostConstruct
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
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.ScopeProvider
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
public fun StorageComponentContainer.configureJavaTopDownAnalysis(moduleContentScope: GlobalSearchScope, project: Project) {
@@ -78,7 +78,7 @@ public fun createContainerForLazyResolveWithJava(
useInstance(declarationProviderFactory)
useInstance(BodyResolveCache.ThrowException)
useImpl<ScopeProvider>()
useImpl<FileScopeProviderImpl>()
useImpl<LazyResolveToken>()
}.let {
it.javaAnalysisInit()
@@ -98,7 +98,7 @@ public fun createContainerForTopDownAnalyzerForJvm(
useInstance(BodyResolveCache.ThrowException)
useImpl<SingleModuleClassResolver>()
useImpl<ScopeProvider>()
useImpl<FileScopeProviderImpl>()
}.let {
it.javaAnalysisInit()