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

(part of IJPL-220534) cleanup: show the container class in "already disposed" error

Browse Source 
GitOrigin-RevId: 897fc390a6e363ebdafe483bf4fa139db15c60c8
This commit is contained in:
Alexey Kudravtsev
2026-01-08 13:36:18 +00:00
committed by intellij-monorepo-bot
parent 7a3fa4d246
commit f8ffdf7da7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt
+8 -8
View File
@@ -689,7 +689,7 @@ abstract class ComponentManagerImpl(
}
catch (cde: ContainerDisposedException) {
if (createIfNeeded) {
throwAlreadyDisposedIfNotUnderIndicatorOrJob(cause = cde)
throwAlreadyDisposedIfNotUnderIndicatorOrJob(serviceClass, cause = cde)
throw ProcessCanceledException(cde)
}
else {
@@ -707,7 +707,7 @@ abstract class ComponentManagerImpl(
return null
}
}
rethrowCEasPCE {
rethrowCEasPCE(serviceClass) {
// fast path
holder.tryGetInstance()?.let {
return it as T
@@ -1566,7 +1566,7 @@ internal fun getOrCreateInstanceBlocking(holder: InstanceHolder, debugString: St
// container scope might be canceled
// => holder is initialized with CE
// => caller should get PCE
rethrowCEasPCE {
rethrowCEasPCE(keyClass?:holder) {
val instance = holder.tryGetInstance()
if (instance != null) {
return instance
@@ -1600,7 +1600,7 @@ private fun doGetOrCreateInstanceBlocking(holder: InstanceHolder, keyClass: Clas
}
}
catch (e: ProcessCanceledException) {
throwAlreadyDisposedIfNotUnderIndicatorOrJob(cause = e)
throwAlreadyDisposedIfNotUnderIndicatorOrJob(keyClass?:holder, cause = e)
throw e
}
}
@@ -1691,7 +1691,7 @@ private inline fun <X> ignoreDisposal(x: () -> X): X? {
}
}
private inline fun <X> rethrowCEasPCE(action: () -> X): X {
private inline fun <X> rethrowCEasPCE(self: Any, action: () -> X): X {
try {
return action()
}
@@ -1699,15 +1699,15 @@ private inline fun <X> rethrowCEasPCE(action: () -> X): X {
throw e
}
catch (e: CancellationException) {
throwAlreadyDisposedIfNotUnderIndicatorOrJob(e)
throwAlreadyDisposedIfNotUnderIndicatorOrJob(self, e)
throw CeProcessCanceledException(e)
}
}
private fun throwAlreadyDisposedIfNotUnderIndicatorOrJob(cause: Throwable) {
private fun throwAlreadyDisposedIfNotUnderIndicatorOrJob(self:Any, cause: Throwable) {
if (!isUnderIndicatorOrJob()) {
// in useInstanceContainer=false AlreadyDisposedException was thrown instead
throw AlreadyDisposedException("Container is already disposed").initCause(cause)
throw AlreadyDisposedException("Container $self is already disposed").initCause(cause)
}
}