MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[air, web] drop manual plugins layout configuration, define plugins entry points only

Browse Source 
GitOrigin-RevId: f6a8e2c334bcfeacc3f565e7e77b3c6090c4a5ca
This commit is contained in:
Alexander Zolotov
2026-02-11 08:43:17 +00:00
committed by intellij-monorepo-bot
parent 69eaa2d308
commit 15983759ad
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fleet/codecache/srcCommonMain/fleet/codecache/ModuleLayerLoader.kt
+8 -6
View File
@@ -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
fleet/modules/api/srcCommonMain/fleet/modules/api/FleetModuleLayer.kt
+1 -1
View File
@@ -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>
}
fleet/modules/jvm/src/fleet/modules/jvm/JvmFleetModuleLayer.kt
+1 -1
View File
@@ -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)
fleet/modules/jvm/src/fleet/modules/jvm/TestJvmFleetModuleLayer.kt
+1 -1
View File
@@ -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?