From 15983759adc6f1ddd8afaf72b2fdc43e10d09480 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <zolotov@jetbrains.com>
Date: Tue, 10 Feb 2026 10:54:58 +0100
Subject: [PATCH] [air, web] drop manual plugins layout configuration, define
 plugins entry points only

GitOrigin-RevId: f6a8e2c334bcfeacc3f565e7e77b3c6090c4a5ca
---
 .../fleet/codecache/ModuleLayerLoader.kt           | 14 ++++++++------
 .../fleet/modules/api/FleetModuleLayer.kt          |  2 +-
 .../src/fleet/modules/jvm/JvmFleetModuleLayer.kt   |  2 +-
 .../fleet/modules/jvm/TestJvmFleetModuleLayer.kt   |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fleet/codecache/srcCommonMain/fleet/codecache/ModuleLayerLoader.kt b/fleet/codecache/srcCommonMain/fleet/codecache/ModuleLayerLoader.kt
index 231a9109f522..f17e3f9bd20f 100644
--- a/fleet/codecache/srcCommonMain/fleet/codecache/ModuleLayerLoader.kt
+++ b/fleet/codecache/srcCommonMain/fleet/codecache/ModuleLayerLoader.kt
@@ -15,12 +15,14 @@ import fleet.util.logging.KLoggers.logger
 
 private val logger by lazy { logger(ResolvedPluginLayer::class) }
 
-fun loadPluginModulesAndResources(moduleLayerLoader: FleetModuleLayerLoader,
-                                  resolvedLayers: Map<LayerSelector, ResolvedPluginLayer>,
-                                  sortedSelectors: List<LayerSelector>,
-                                  externalDependencies: Map<LayerSelector, List<FleetModuleLayer>>,
-                                  baseLayers: List<FleetModuleLayer>,
-                                  loadDockModuleLayer: (modulePath: Set<FleetModuleInfo>) -> FleetModuleLayer): Map<LayerSelector, PluginModulesAndResources> {
+suspend fun loadPluginModulesAndResources(
+  moduleLayerLoader: FleetModuleLayerLoader,
+  resolvedLayers: Map<LayerSelector, ResolvedPluginLayer>,
+  sortedSelectors: List<LayerSelector>,
+  externalDependencies: Map<LayerSelector, List<FleetModuleLayer>>,
+  baseLayers: List<FleetModuleLayer>,
+  loadDockModuleLayer: (modulePath: Set<FleetModuleInfo>) -> FleetModuleLayer,
+): Map<LayerSelector, PluginModulesAndResources> {
   val result = HashMap<LayerSelector, PluginModulesAndResources>(sortedSelectors.size)
   for (selector in sortedSelectors) {
     val resolvedLayer = resolvedLayers.get(selector) ?: continue
diff --git a/fleet/modules/api/srcCommonMain/fleet/modules/api/FleetModuleLayer.kt b/fleet/modules/api/srcCommonMain/fleet/modules/api/FleetModuleLayer.kt
index af211cbd24be..75f940bf9952 100644
--- a/fleet/modules/api/srcCommonMain/fleet/modules/api/FleetModuleLayer.kt
+++ b/fleet/modules/api/srcCommonMain/fleet/modules/api/FleetModuleLayer.kt
@@ -5,7 +5,7 @@ import kotlin.reflect.KClass
 interface FleetModuleLayer {
   val modules: Set<FleetModule>
 
-  fun findModule(name: String): FleetModule?
+  suspend fun findModule(name: String): FleetModule?
 
   fun <T: Any> findServices(service: KClass<T>, requestor: KClass<*>): Iterable<T>
 }
\ No newline at end of file
diff --git a/fleet/modules/jvm/src/fleet/modules/jvm/JvmFleetModuleLayer.kt b/fleet/modules/jvm/src/fleet/modules/jvm/JvmFleetModuleLayer.kt
index e2d553b37f81..5a2db1db0954 100644
--- a/fleet/modules/jvm/src/fleet/modules/jvm/JvmFleetModuleLayer.kt
+++ b/fleet/modules/jvm/src/fleet/modules/jvm/JvmFleetModuleLayer.kt
@@ -20,7 +20,7 @@ data class JvmFleetModuleLayer(val layer: ModuleLayer) : FleetModuleLayer {
     }
   }
 
-  override fun findModule(name: String): FleetModule? {
+  override suspend fun findModule(name: String): FleetModule? {
     return layer
       .findModule(name)
       .map(::JvmFleetModule)
diff --git a/fleet/modules/jvm/src/fleet/modules/jvm/TestJvmFleetModuleLayer.kt b/fleet/modules/jvm/src/fleet/modules/jvm/TestJvmFleetModuleLayer.kt
index f7a9337f02b0..f19da9e15d11 100644
--- a/fleet/modules/jvm/src/fleet/modules/jvm/TestJvmFleetModuleLayer.kt
+++ b/fleet/modules/jvm/src/fleet/modules/jvm/TestJvmFleetModuleLayer.kt
@@ -49,7 +49,7 @@ class TestJvmFleetModuleLayer(
   override val modules: Set<FleetModule>
     get() = cachedModules
 
-  override fun findModule(name: String): FleetModule? = moduleByName[name]
+  override suspend fun findModule(name: String): FleetModule? = moduleByName[name]
 
   override fun <T : Any> findServices(service: KClass<T>, requestor: KClass<*>): Iterable<T> =
     modules.flatMap { it.findServices(service, requestor) } // TODO: could we do better in terms of performance here?