From 13c7fde071f55000c3c3eab9a6417c90ee47bb83 Mon Sep 17 00:00:00 2001
From: Jinseong Jeon <jsjeon@google.com>
Date: Fri, 10 Jun 2022 22:13:55 -0700
Subject: [PATCH] AA: avoid reflective service registrations

---
 .../StandaloneAnalysisAPISessionBuilder.kt     |  4 ++--
 .../analysis/api/standalone/StandaloneUtils.kt | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt
index 3bd1c935b32..151066b3fcc 100644
--- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt
+++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneAnalysisAPISessionBuilder.kt
@@ -149,8 +149,8 @@ public class StandaloneAnalysisAPISessionBuilder(
                 }
             )
 
-            registerService(SymbolLightClassFacadeCache::class.java)
-            registerService(ClsJavaStubByVirtualFileCache::class.java)
+            registerService(SymbolLightClassFacadeCache::class.java, SymbolLightClassFacadeCache(this))
+            registerService(ClsJavaStubByVirtualFileCache::class.java, ClsJavaStubByVirtualFileCache())
             registerService(KotlinAsJavaSupport::class.java, KotlinAsJavaFirSupport(this))
         }
 
diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneUtils.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneUtils.kt
index aafd355292e..43cf18d1705 100644
--- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneUtils.kt
+++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/api/standalone/StandaloneUtils.kt
@@ -100,19 +100,21 @@ internal fun configureProjectEnvironment(
 ) {
     reRegisterJavaElementFinder(project)
 
-    // FIR LC
-    project.registerService(
-        SymbolLightClassFacadeCache::class.java
-    )
-    project.registerService(
-        ClsJavaStubByVirtualFileCache::class.java
-    )
-
     project.picoContainer.registerComponentInstance(
         KotlinModificationTrackerFactory::class.qualifiedName,
         KotlinStaticModificationTrackerFactory()
     )
 
+    // FIR LC
+    project.registerService(
+        SymbolLightClassFacadeCache::class.java,
+        SymbolLightClassFacadeCache(project)
+    )
+    project.registerService(
+        ClsJavaStubByVirtualFileCache::class.java,
+        ClsJavaStubByVirtualFileCache()
+    )
+
     project.registerService(
         KotlinAnnotationsResolverFactory::class.java,
         KotlinStaticAnnotationsResolverFactory(ktFiles)