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

FileScopeProvider(Impl): use DefaultImplementation annotation

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-03-02 13:34:26 +03:00
parent 2b373a3601
commit aeda85b256
5 changed files with 2 additions and 7 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
-2
View File
@@ -41,7 +41,6 @@ import org.jetbrains.kotlin.platform.JvmBuiltIns
import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.resolve.lazy.FileScopeProviderImpl
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
@@ -61,7 +60,6 @@ private fun StorageComponentContainer.configureJavaTopDownAnalysis(
useInstance(VirtualFileFinderFactory.getInstance(project).create(moduleContentScope))
useImpl<FileScopeProviderImpl>()
useImpl<AnnotationResolverImpl>()
useImpl<JavaClassFinderImpl>()
compiler/frontend/src/org/jetbrains/kotlin/analyzer/common/DefaultAnalyzerFacade.kt
-2
View File
@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.load.kotlin.MetadataFinderFactory
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.*
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.resolve.lazy.declarations.DeclarationProviderFactoryService
@@ -132,7 +131,6 @@ object DefaultAnalyzerFacade : AnalyzerFacade<PlatformAnalysisParameters>() {
useInstance(LookupTracker.DO_NOTHING)
useImpl<ResolveSession>()
useImpl<LazyTopDownAnalyzer>()
useImpl<FileScopeProviderImpl>()
useInstance(languageVersionSettings)
useImpl<AnnotationResolverImpl>()
useImpl<CompilerDeserializationConfiguration>()
compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
-1
View File
@@ -160,7 +160,6 @@ fun createContainerForLazyResolve(
useInstance(LookupTracker.DO_NOTHING)
useInstance(languageVersionSettings)
useImpl<FileScopeProviderImpl>()
useImpl<AnnotationResolverImpl>()
useImpl<CompilerDeserializationConfiguration>()
targetEnvironment.configure(this)
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProvider.kt
+2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.resolve.lazy
import com.intellij.openapi.util.Key
import org.jetbrains.kotlin.container.DefaultImplementation
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.UserDataProperty
import org.jetbrains.kotlin.resolve.BindingTrace
@@ -24,6 +25,7 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.recordScope
import org.jetbrains.kotlin.resolve.scopes.LexicalScope
import org.jetbrains.kotlin.storage.StorageManager
@DefaultImplementation(FileScopeProviderImpl::class)
interface FileScopeProvider {
fun getFileResolutionScope(file: KtFile): LexicalScope = getFileScopes(file).lexicalScope
fun getImportResolver(file: KtFile): ImportResolver = getFileScopes(file).importResolver
js/js.frontend/src/org/jetbrains/kotlin/frontend/js/di/injection.kt
-2
View File
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.frontend.di.configureModule
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.js.resolve.JsPlatform
import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.lazy.FileScopeProviderImpl
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
@@ -42,7 +41,6 @@ fun createTopDownAnalyzerForJs(
configureModule(moduleContext, JsPlatform, TargetPlatformVersion.NoVersion, bindingTrace)
useInstance(declarationProviderFactory)
useImpl<FileScopeProviderImpl>()
useImpl<AnnotationResolverImpl>()
CompilerEnvironment.configure(this)