From ff4a71386e91111c12749fb53618cee7927bea17 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 23 Apr 2020 17:43:16 +0300
Subject: [PATCH] [FIR] Register extension point component in fir sessions

---
 .../kotlin/fir/java/FirJavaModuleBasedSession.kt          | 8 ++++++++
 .../src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
index dd55a4b5ea0..c6d52a7bcc5 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
@@ -14,6 +14,9 @@ import org.jetbrains.kotlin.fir.FirModuleBasedSession
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSessionBase
 import org.jetbrains.kotlin.fir.FirSessionProvider
+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.resolve.FirProvider
 import org.jetbrains.kotlin.fir.resolve.FirSymbolProvider
@@ -114,6 +117,11 @@ class FirLibrarySession private constructor(
             FirCorrespondingSupertypesCache(this)
         )
 
+        registerComponent(
+            FirExtensionPointService::class,
+            FirExtensionPointService(this)
+        )
+
         sessionProvider.sessionCache[moduleInfo] = this
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt
index 4949c682af5..8b522fde61e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirModuleBasedSession.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir
 
 import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService
 import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.resolve.impl.*
 import org.jetbrains.kotlin.fir.scopes.impl.FirDeclaredMemberScopeProvider
@@ -16,6 +17,7 @@ abstract class FirModuleBasedSession(override val moduleInfo: ModuleInfo, sessio
         registerComponent(FirQualifierResolver::class, FirQualifierResolverImpl(this))
         registerComponent(FirTypeResolver::class, FirTypeResolverImpl(this))
         registerComponent(FirDeclaredMemberScopeProvider::class, FirDeclaredMemberScopeProvider())
+        registerComponent(FirExtensionPointService::class, FirExtensionPointService(this))
     }
 }