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

[FIR] Rename FirExtensionRegistrarExtension to FirExtensionRegistrar

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-04-27 11:51:57 +03:00
parent dd2b7f87f7
commit cb0a7a5bf7
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
+2 -2
View File
@@ -62,7 +62,7 @@
interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/> interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
<extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler" <extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
interface="com.intellij.refactoring.rename.RenameHandler"/> interface="com.intellij.refactoring.rename.RenameHandler"/>
<extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension" <extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"
interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension"/> interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"/>
</extensionPoints> </extensionPoints>
</idea-plugin> </idea-plugin>
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
-2
View File
@@ -15,8 +15,6 @@ import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.FirSessionBase import org.jetbrains.kotlin.fir.FirSessionBase
import org.jetbrains.kotlin.fir.FirSessionProvider import org.jetbrains.kotlin.fir.FirSessionProvider
import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension
import org.jetbrains.kotlin.fir.extensions.FirRegisteredExtension
import org.jetbrains.kotlin.fir.java.deserialization.KotlinDeserializedJvmSymbolsProvider import org.jetbrains.kotlin.fir.java.deserialization.KotlinDeserializedJvmSymbolsProvider
import org.jetbrains.kotlin.fir.resolve.FirProvider import org.jetbrains.kotlin.fir.resolve.FirProvider
import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider
compiler/fir/plugins/allopen-plugin/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension → compiler/fir/plugins/allopen-plugin/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
View File
compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/FirAllOpenComponentRegistrar.kt
+2 -2
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.fir.allopen package org.jetbrains.kotlin.fir.allopen
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarExtension import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
class FirAllOpenComponentRegistrar : FirExtensionRegistrarExtension() { class FirAllOpenComponentRegistrar : FirExtensionRegistrar() {
override fun ExtensionRegistrarContext.configurePlugin() { override fun ExtensionRegistrarContext.configurePlugin() {
+::AllOpenStatusTransformer +::AllOpenStatusTransformer
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrarExtension.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/extensions/FirExtensionRegistrar.kt
+5 -5
View File
@@ -8,10 +8,10 @@ package org.jetbrains.kotlin.fir.extensions
import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
abstract class FirExtensionRegistrarExtension { abstract class FirExtensionRegistrar {
companion object : ProjectExtensionDescriptor<FirExtensionRegistrarExtension>( companion object : ProjectExtensionDescriptor<FirExtensionRegistrar>(
"org.jetbrains.kotlin.fir.frontendIrExtensionRegistrarExtension", "org.jetbrains.kotlin.fir.frontendIrExtension",
FirExtensionRegistrarExtension::class.java FirExtensionRegistrar::class.java
) )
protected inner class ExtensionRegistrarContext { protected inner class ExtensionRegistrarContext {
@@ -36,6 +36,6 @@ abstract class FirExtensionRegistrarExtension {
) )
} }
fun FirExtensionPointService.registerExtensions(extensions: FirExtensionRegistrarExtension.RegisteredExtensions) { fun FirExtensionPointService.registerExtensions(extensions: FirExtensionRegistrar.RegisteredExtensions) {
registerExtensions(FirStatusTransformerExtension::class, extensions.statusTransformerExtensions) registerExtensions(FirStatusTransformerExtension::class, extensions.statusTransformerExtensions)
} }