MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[sdk, eel] Fix handling of invalid paths in sdks #2

Browse Source 
(cherry picked from commit f43b0685df3315a655efc292fbcc9b8ad765d1e3)

IJ-CR-156677

GitOrigin-RevId: ba2fac60ffa67f818e8e3a1290cd7ba08cefe597
This commit is contained in:
Konstantin Nisht
2025-02-24 09:40:12 +01:00
committed by intellij-monorepo-bot
parent f3011e1e30
commit 18f567d5a3
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkModificatorBridgeImpl.kt
View File

@@ -9,11 +9,11 @@ import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.util.JDOMUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.platform.backend.workspace.virtualFile
import com.intellij.platform.eel.EelDescriptor
import com.intellij.platform.eel.provider.LocalEelDescriptor
import com.intellij.platform.eel.provider.getEelDescriptor
import com.intellij.platform.workspace.jps.entities.*
import com.intellij.platform.workspace.jps.serialization.impl.ELEMENT_ADDITIONAL
import com.intellij.platform.workspace.jps.serialization.impl.toPath
import com.intellij.util.concurrency.ThreadingAssertions
import com.intellij.util.concurrency.annotations.RequiresWriteLock
import com.intellij.util.containers.ConcurrentFactoryMap
@@ -55,13 +55,7 @@ internal class SdkModificatorBridgeImpl(private val originalEntity: SdkEntity.Bu
override fun setHomePath(path: String?) {
modifiedSdkEntity.homePath = if (path != null) {
val descriptor = try {
Path.of(path).getEelDescriptor()
}
catch (_: InvalidPathException) {
// sometimes (in Ruby) the SDK home is set to 'temp:///root/nostubs'
LocalEelDescriptor
}
val descriptor = getDescriptor(path)
val globalInstance = GlobalWorkspaceModel.getInstance(descriptor).getVirtualFileUrlManager()
globalInstance.getOrCreateFromUrl(path)
} else {
@@ -117,7 +111,7 @@ internal class SdkModificatorBridgeImpl(private val originalEntity: SdkEntity.Bu
ThreadingAssertions.assertWriteAccess()
if (isCommitted) error("Modification already completed")
val descriptor = modifiedSdkEntity.homePath?.toPath()?.getEelDescriptor() ?: LocalEelDescriptor
val descriptor = getDescriptor(modifiedSdkEntity.homePath?.toString())
val globalWorkspaceModel = GlobalWorkspaceModel.getInstance(descriptor)
@@ -174,4 +168,15 @@ internal class SdkModificatorBridgeImpl(private val originalEntity: SdkEntity.Bu
override fun toString(): String {
return "$name Version:$versionString Path:($homePath)"
}
private fun getDescriptor(path: String?): EelDescriptor {
path ?: return LocalEelDescriptor
return try {
Path.of(path).getEelDescriptor()
}
catch (_: InvalidPathException) {
// sometimes (in Ruby) the SDK home is set to 'temp:///root/nostubs'
LocalEelDescriptor
}
}
}