From 70caae4c6fcfbcad5b6420003b2523290fd06ae4 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 1 Sep 2017 12:40:17 +0200 Subject: [PATCH] Register new service and EPs added in 173 --- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index f1a75130c8e..676d1123519 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -28,6 +28,9 @@ import com.intellij.ide.highlighter.JavaFileType import com.intellij.ide.plugins.PluginManagerCore import com.intellij.lang.MetaLanguage import com.intellij.lang.java.JavaParserDefinition +import com.intellij.lang.jvm.facade.JvmElementProvider +import com.intellij.lang.jvm.facade.JvmFacade +import com.intellij.lang.jvm.facade.JvmFacadeImpl import com.intellij.openapi.Disposable import com.intellij.openapi.application.TransactionGuard import com.intellij.openapi.application.TransactionGuardImpl @@ -43,6 +46,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.* import com.intellij.openapi.vfs.impl.ZipHandler import com.intellij.psi.FileContextProvider +import com.intellij.psi.JavaModuleSystem import com.intellij.psi.PsiElementFinder import com.intellij.psi.PsiManager import com.intellij.psi.augment.PsiAugmentProvider @@ -142,6 +146,8 @@ class KotlinCoreEnvironment private constructor( } super.registerJavaPsiFacade() + + project.registerService(JvmFacade::class.java, JvmFacadeImpl(project, myMessageBus)) } } @@ -500,6 +506,8 @@ class KotlinCoreEnvironment private constructor( // CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier::class.java) CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaLanguage.EP_NAME, MetaLanguage::class.java) + // + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), JavaModuleSystem.EP_NAME, JavaModuleSystem::class.java) } private fun registerApplicationExtensionPointsAndExtensionsFrom(configuration: CompilerConfiguration, configFilePath: String) { @@ -549,6 +557,7 @@ class KotlinCoreEnvironment private constructor( private fun registerProjectExtensionPoints(area: ExtensionsArea) { CoreApplicationEnvironment.registerExtensionPoint(area, PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, PsiElementFinder.EP_NAME, PsiElementFinder::class.java) + CoreApplicationEnvironment.registerExtensionPoint(area, JvmElementProvider.EP_NAME, JvmElementProvider::class.java) } // made public for Upsource