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

Minor, delete ModuleContext#builtIns

Browse Source
This commit is contained in:
Alexander Udalov
2016-09-24 18:10:55 +03:00
parent 0180c614c0
commit 1d6abc32bc
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+1 -1
View File
@@ -154,7 +154,7 @@ public enum TopDownAnalyzerFacadeForJVM {
projectContext, Name.special("<" + configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME) + ">"), projectContext, Name.special("<" + configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME) + ">"),
JvmPlatform.INSTANCE, builtIns JvmPlatform.INSTANCE, builtIns
); );
context.setDependencies(context.getModule(), context.getBuiltIns().getBuiltInsModule()); context.setDependencies(context.getModule(), builtIns.getBuiltInsModule());
return context; return context;
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
-3
View File
@@ -44,9 +44,6 @@ interface ModuleContext : ProjectContext {
val platformToKotlinClassMap: PlatformToKotlinClassMap val platformToKotlinClassMap: PlatformToKotlinClassMap
get() = module.platformToKotlinClassMap get() = module.platformToKotlinClassMap
val builtIns: KotlinBuiltIns
get() = module.builtIns
} }
interface MutableModuleContext: ModuleContext { interface MutableModuleContext: ModuleContext {
compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+5 -2
View File
@@ -17,7 +17,10 @@
package org.jetbrains.kotlin.frontend.di package org.jetbrains.kotlin.frontend.di
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.container.* import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.container.get
import org.jetbrains.kotlin.container.useImpl
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.context.LazyResolveToken import org.jetbrains.kotlin.context.LazyResolveToken
import org.jetbrains.kotlin.context.ModuleContext import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
@@ -36,7 +39,7 @@ fun StorageComponentContainer.configureModule(
useInstance(moduleContext.module) useInstance(moduleContext.module)
useInstance(moduleContext.project) useInstance(moduleContext.project)
useInstance(moduleContext.storageManager) useInstance(moduleContext.storageManager)
useInstance(moduleContext.builtIns) useInstance(moduleContext.module.builtIns)
useInstance(moduleContext.platformToKotlinClassMap) useInstance(moduleContext.platformToKotlinClassMap)
useInstance(platform) useInstance(platform)