From 5c2d6c3db3a9e1fe9e7d1aa8232be415bc25f5be Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <alexander.koshevoy@jetbrains.com>
Date: Fri, 31 Oct 2025 17:53:33 +0100
Subject: [PATCH] [eel][sdk] IJPL-215427 Refactor global entity filtering logic
 in JpsGlobalModelSynchronizerImpl

Streamline entity filtering by introducing a `filterValidSdkEntitiesAssertingUnexpectedAdditionalDataModification` method to handle SDK-specific cases. Replace conditional statements with `when` expressions for improved clarity and readability.


(cherry picked from commit 29285b97b7c897f305c91600321851ea73abf6a8)

IJ-CR-181063

GitOrigin-RevId: 1030ba949cc73dfb8187ba0a8b769541b9698c23
---
 .../JpsGlobalModelSynchronizerImpl.kt         | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt b/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt
index 0764f5ffa6bf..55b1876b7d8b 100644
--- a/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/workspaceModel/ide/impl/jps/serialization/JpsGlobalModelSynchronizerImpl.kt
@@ -155,18 +155,20 @@ open class JpsGlobalModelSynchronizerImpl(private val coroutineScope: CoroutineS
     entityStorage: EntityStorage, serializer: JpsFileEntityTypeSerializer<WorkspaceEntity>,
     contentWriter: JpsAppFileContentWriter,
   ) {
-    val entities = entityStorage.entities(serializer.mainEntityClass).toList()
+    val entities = entityStorage.entities(serializer.mainEntityClass)
     LOG.info("Saving global entities ${serializer.mainEntityClass.name} to files")
 
-    val filteredEntities = if (serializer.mainEntityClass == LibraryEntity::class.java) {
-      // We need to filter custom libraries, they will be serialized by the client code and not by the platform
-      entities.filter { it.entitySource is JpsGlobalFileEntitySource }
-    }
-    else entities
-
-    if (serializer.mainEntityClass == SdkEntity::class.java) {
-      assertUnexpectedAdditionalDataModification(entityStorage)
-    }
+    val filteredEntities =
+      when (serializer.mainEntityClass) {
+        LibraryEntity::class.java -> {
+          // We need to filter custom libraries, they will be serialized by the client code and not by the platform
+          entities.filter { it.entitySource is JpsGlobalFileEntitySource }.toList()
+        }
+        SdkEntity::class.java -> {
+          filterValidSdkEntitiesAssertingUnexpectedAdditionalDataModification(entityStorage)
+        }
+        else -> entities.toList()
+      }
 
     if (filteredEntities.isEmpty()) {
       // Remove empty files
@@ -178,10 +180,27 @@ open class JpsGlobalModelSynchronizerImpl(private val coroutineScope: CoroutineS
   }
 
 
-  private fun assertUnexpectedAdditionalDataModification(entityStorage: EntityStorage) {
+  /**
+   * Collects SDK entities that are safe to serialize and emits diagnostics if the runtime bridge's
+   * `SdkAdditionalData` diverges from what is stored in the entity.
+   *
+   * Contract:
+   * - Always returns all SDK entities that have a corresponding
+   *   [com.intellij.openapi.projectRoots.impl.SdkBridge].
+   * - Never blocks saving; on mismatch, logs a diagnostic to help detect missed calls to
+   *   [com.intellij.openapi.projectRoots.SdkAdditionalData.markAsCommited].
+   */
+  private fun filterValidSdkEntitiesAssertingUnexpectedAdditionalDataModification(entityStorage: EntityStorage): List<WorkspaceEntity> {
+    val result = mutableListOf<WorkspaceEntity>()
     for (sdkEntity in entityStorage.entities(SdkEntity::class.java)) {
-      val projectJdkImpl = entityStorage.sdkMap.getDataByEntity(sdkEntity) ?: error(
-        "SdkBridge has to be available for the SdkEntity: ${sdkEntity.name}; type: ${sdkEntity.type}; path: ${sdkEntity.homePath}")
+      val projectJdkImpl = entityStorage.sdkMap.getDataByEntity(sdkEntity)
+      if (projectJdkImpl == null) {
+        LOG.error("SdkBridge has to be available for the SdkEntity: ${sdkEntity.name}; type: ${sdkEntity.type}; path: ${sdkEntity.homePath}")
+        continue
+      }
+      else {
+        result.add(sdkEntity)
+      }
       val additionalData = projectJdkImpl.sdkAdditionalData
       if (additionalData == null) continue
       val additionalDataElement = Element(ELEMENT_ADDITIONAL)
@@ -197,6 +216,7 @@ open class JpsGlobalModelSynchronizerImpl(private val coroutineScope: CoroutineS
                   "Probably inconsistent update of the $className, see the documentation of `SdkAdditionalData#markAsCommited` for more information")
       }
     }
+    return result
   }
 
   private suspend fun waitForActiveProjectJobs() {
@@ -265,7 +285,8 @@ open class JpsGlobalModelSynchronizerImpl(private val coroutineScope: CoroutineS
     }
     val callback = if (initializeBridges) {
       bridgesInitializationCallback(environmentName, mutableStorage, initialEntityStorage, true)
-    } else {
+    }
+    else {
       { }
     }
     loadedFromDisk[environmentName] = true