User: joe
Date: 12 Nov 26 22:33
Revision: a15f25bace4fbd992dce023d71421d84d3e43c6e
Summary:
Merge branch '2026.2' into 2026.3


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10734&personal=false

Index: src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt
===================================================================
--- src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt	(revision e37878b98ac1c3eaf79493b9f2219e44a14ace4d)
+++ src/main/kotlin/translations/identification/TranslationExternalAnnotationsArtifactsResolver.kt	(revision a15f25bace4fbd992dce023d71421d84d3e43c6e)
@@ -45,7 +45,7 @@
 import com.intellij.platform.workspace.jps.entities.LibraryRootTypeId
 import com.intellij.platform.workspace.jps.entities.modifyLibraryEntity
 import com.intellij.platform.workspace.storage.MutableEntityStorage
-import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge
+import com.intellij.workspaceModel.ide.legacyBridge.findLibraryId
 import org.jetbrains.concurrency.AsyncPromise
 import org.jetbrains.concurrency.Promise
 import org.jetbrains.concurrency.resolvedPromise
@@ -76,13 +76,13 @@
         annotationsLocation: AnnotationsLocation,
         diff: MutableEntityStorage
     ): Boolean {
-        if (library !is LibraryBridge || library.isDisposed) {
+        if (library is LibraryEx && library.isDisposed) {
             return true
         }
 
         val annotationsPath = findAnnotationsPath(false) ?: findAnnotationsPath(true) ?: return false
 
-        val libraryEntity = diff.resolve(library.libraryId) ?: return true
+        val libraryEntity = diff.resolve(findLibraryId(library)) ?: return true
         val vfUrlManager = WorkspaceModel.getInstance(project).getVirtualFileUrlManager()
         val newUrl = vfUrlManager.storeAndGet(annotationsPath)
         val annotationsRootType = LibraryRootTypeId(AnnotationOrderRootType.ANNOTATIONS_ID)