fix application service registration

by using the shared KotlinCoreEnvironment.underApplicationLock.
google · Jan 16, 2025 · d6b0360 · d6b0360
1 parent f47b8c7
commit d6b0360
Showing 1 changed file with 24 additions and 17 deletions.
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt
@@ -89,6 +89,7 @@ import org.jetbrains.kotlin.analysis.project.structure.builder.KtModuleProviderB
 import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtSdkModule
 import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreApplicationEnvironmentMode
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.setupIdeaStandaloneExecution
 import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoots
@@ -137,9 +138,6 @@ class KotlinSymbolProcessing(
         // Let exceptions pop through to the caller. Don't catch and convert them to, e.g., INTERNAL_ERROR.
     }
 
-    private var applicationServiceRegistered = false
-    private var applicationServiceRegisteredLock = object {}
-
     init {
         // We depend on swing (indirectly through PSI or something), so we want to declare headless mode,
         // to avoid accidentally starting the UI thread. But, don't set it if it was set externally.
@@ -243,20 +241,15 @@ class KotlinSymbolProcessing(
                 libraryRoots,
             )
 
-        synchronized(applicationServiceRegisteredLock) {
-            if (!applicationServiceRegistered) {
-                applicationServiceRegistered = true
-                val application = kotlinCoreProjectEnvironment.environment.application
-                application.registerService(
-                    org.jetbrains.kotlin.analysis.api.permissions.KaAnalysisPermissionRegistry::class.java,
-                    org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionRegistry::class.java
-                )
-                application.registerService(
-                    KotlinAnalysisPermissionOptions::class.java,
-                    KotlinStandaloneAnalysisPermissionOptions::class.java
-                )
-            }
-        }
+        kotlinCoreProjectEnvironment.registerApplicationServices(
+            org.jetbrains.kotlin.analysis.api.permissions.KaAnalysisPermissionRegistry::class.java,
+            org.jetbrains.kotlin.analysis.api.impl.base.permissions.KaBaseAnalysisPermissionRegistry::class.java
+        )
+        kotlinCoreProjectEnvironment.registerApplicationServices(
+            KotlinAnalysisPermissionOptions::class.java,
+            KotlinStandaloneAnalysisPermissionOptions::class.java
+        )
+
         registerProjectServices(
             kotlinCoreProjectEnvironment,
             ktFiles,
@@ -278,6 +271,20 @@ class KotlinSymbolProcessing(
         )
     }
 
+    private fun <T> KotlinCoreProjectEnvironment.registerApplicationServices(
+        serviceInterface: Class<T>,
+        serviceImplementation: Class<out T>
+    ) {
+        val application = environment.application
+        if (application.getServiceIfCreated(serviceInterface) == null) {
+            KotlinCoreEnvironment.underApplicationLock {
+                if (application.getServiceIfCreated(serviceInterface) == null) {
+                    application.registerService(serviceInterface, serviceImplementation)
+                }
+            }
+        }
+    }
+
     // TODO: org.jetbrains.kotlin.analysis.providers.impl.KotlinStatic*
     private fun registerProjectServices(
         kotlinCoreProjectEnvironment: KotlinCoreProjectEnvironment,