mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[wsm] IJPL-178632 Remove redundant SDK entity filtering in GlobalSdkBridgesLoader
Drop `shouldSkipEntityProcessing` and the related filtering, so SDK bridges are always created for all SDK entities. The previous revision conditionally omitted bridge creation for some SDKs, leading to mismatches between Workspace Model state and legacy SDK bridges (e.g., inconsistent SDK availability and updates). To avoid re‑introducing the need for ad‑hoc filtering, distinguish SDK entities earlier during deserialization and separate them by source/environment there. This keeps SDK initialization simple and makes bridge creation deterministic across cache loads and environments. GitOrigin-RevId: 7ed58a394c59310a35e72110ea3eb20c753275b8
This commit is contained in:
committed by
intellij-monorepo-bot
parent
6205dc5668
commit
5985e14d11
+1
-12
@@ -54,14 +54,7 @@ private class GlobalSdkBridgesLoader(private val eelMachine: EelMachine) : Globa
|
||||
thisLogger().debug("Initial load of SDKs")
|
||||
|
||||
for ((entity, sdkBridge) in sdks) {
|
||||
if (shouldSkipEntityProcessing(entity)) {
|
||||
// The SDKs are populated from a single file for now. All loaded SDK entities go to the same entity storage
|
||||
// We want to avoid having alien SDKs in storages, hence we filter them
|
||||
mutableStorage.removeEntity(entity)
|
||||
}
|
||||
else {
|
||||
mutableStorage.mutableSdkMap.addIfAbsent(entity, sdkBridge)
|
||||
}
|
||||
mutableStorage.mutableSdkMap.addIfAbsent(entity, sdkBridge)
|
||||
}
|
||||
return {}
|
||||
}
|
||||
@@ -72,10 +65,6 @@ private class GlobalSdkBridgesLoader(private val eelMachine: EelMachine) : Globa
|
||||
val addChanges = sdkChanges.filterIsInstance<EntityChange.Added<SdkEntity>>()
|
||||
|
||||
for (addChange in addChanges) {
|
||||
if (shouldSkipEntityProcessing(addChange.newEntity)) {
|
||||
continue
|
||||
}
|
||||
|
||||
// Will initialize the bridge if missing
|
||||
builder.mutableSdkMap.getOrPutDataByEntity(addChange.newEntity) {
|
||||
val sdkEntityCopy = SdkBridgeImpl.createEmptySdkEntity("", "", "")
|
||||
|
||||
Reference in New Issue
Block a user