MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-310 notifyListeners not under lock (explicit runtime registration)

Browse Source 
GitOrigin-RevId: 92af019b38ce540623d031aca9f455614143bc10
This commit is contained in:
Vladimir Krivosheev
2023-10-26 16:21:54 +02:00
committed by intellij-monorepo-bot
parent a9f3e8259a
commit 0585d0d4d1
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.kt
View File

@@ -19,6 +19,7 @@ import kotlinx.collections.immutable.*
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.NonNls
import org.jetbrains.annotations.TestOnly
import org.jetbrains.annotations.VisibleForTesting
import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentMap
@@ -118,7 +119,6 @@ sealed class ExtensionPointImpl<T : Any>(val name: String,
doRegisterExtension(extension = extension, order = order, pluginDescriptor = getPluginDescriptor(), parentDisposable = parentDisposable)
}
@Synchronized
private fun doRegisterExtension(extension: T,
order: LoadingOrder,
pluginDescriptor: PluginDescriptor,
@@ -126,15 +126,19 @@ sealed class ExtensionPointImpl<T : Any>(val name: String,
assertNotReadOnlyMode()
checkExtensionType(extension = extension, extensionClass = getExtensionClass(), adapter = null)
for (adapter in adapters) {
if (adapter is ObjectComponentAdapter<*> && adapter.instance === extension) {
LOG.error("Extension was already added: $extension")
return
val adapter = ObjectComponentAdapter(instance = extension, pluginDescriptor = pluginDescriptor, loadingOrder = order)
synchronized(this) {
assertNotReadOnlyMode()
for (a in adapters) {
if (a is ObjectComponentAdapter<*> && a.instance === extension) {
LOG.error("Extension was already added: $extension")
return
}
}
addExtensionAdapter(adapter)
}
val adapter = ObjectComponentAdapter(instance = extension, pluginDescriptor = pluginDescriptor, loadingOrder = order)
addExtensionAdapter(adapter)
notifyListeners(isRemoved = false, adapters = persistentListOf(adapter), listeners = listeners)
if (parentDisposable != null) {
@@ -148,8 +152,8 @@ sealed class ExtensionPointImpl<T : Any>(val name: String,
adapters = adapters.removeAt(index)
clearCache()
notifyListeners(isRemoved = true, adapters = persistentListOf(adapter), listeners = listeners)
}
notifyListeners(isRemoved = true, adapters = persistentListOf(adapter), listeners = listeners)
}
}
}
@@ -788,6 +792,7 @@ sealed class ExtensionPointImpl<T : Any>(val name: String,
// private, internal only for tests
@Synchronized
@VisibleForTesting
fun addExtensionAdapter(adapter: ExtensionComponentAdapter) {
adapters = adapters.add(adapter)
clearCache()