[FIR] Add FirExtensionRegistrarAdapter to fix extension points in FE 1.0 IDE plugin
FirExtensionRegistrar is FIR specific extension which requires FIR classes to work, which are missing in dependencies of FE 1.0 IDE plugin. To fix this issue FirExtensionRegistrarAdapter is introduced. This class is a base class for FirExtensionRegistrar and it does not have any FIR specific classes in it's API, so it can be safely registered in IDE
This commit is contained in:
committed by
teamcity
parent
a2395ec8bb
commit
7bcd3c7948
@@ -66,8 +66,8 @@
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
|
||||
interface="com.intellij.refactoring.rename.RenameHandler"
|
||||
dynamic="true"/>
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"
|
||||
interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"/>
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter"
|
||||
interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter"/>
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.DescriptorSerializerPlugin"
|
||||
interface="org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin"/>
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.defaultErrorMessages"
|
||||
|
||||
@@ -82,7 +82,7 @@ import org.jetbrains.kotlin.config.*
|
||||
import org.jetbrains.kotlin.extensions.*
|
||||
import org.jetbrains.kotlin.extensions.internal.CandidateInterceptor
|
||||
import org.jetbrains.kotlin.extensions.internal.TypeResolutionInterceptor
|
||||
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
|
||||
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
|
||||
import org.jetbrains.kotlin.idea.KotlinFileType
|
||||
import org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension
|
||||
import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache
|
||||
@@ -649,7 +649,7 @@ class KotlinCoreEnvironment private constructor(
|
||||
TypeResolutionInterceptor.registerExtensionPoint(project)
|
||||
CandidateInterceptor.registerExtensionPoint(project)
|
||||
DescriptorSerializerPlugin.registerExtensionPoint(project)
|
||||
FirExtensionRegistrar.registerExtensionPoint(project)
|
||||
FirExtensionRegistrarAdapter.registerExtensionPoint(project)
|
||||
}
|
||||
|
||||
internal fun registerExtensionsFromPlugins(project: MockProject, configuration: CompilerConfiguration) {
|
||||
|
||||
Reference in New Issue
Block a user