From c32266fe233c356df999ea389441e1f63dce6ef9 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 12 Mar 2019 15:50:02 +0100 Subject: [PATCH] RegistryKeyBean - mark pluginDescriptor as transient (to get rid of warning about "no accessors for class PluginDescriptor") --- .../openapi/util/registry/RegistryExtensionCollector.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/util/registry/RegistryExtensionCollector.kt b/platform/platform-impl/src/com/intellij/openapi/util/registry/RegistryExtensionCollector.kt index b26269285a3c..f556db2405f5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/util/registry/RegistryExtensionCollector.kt +++ b/platform/platform-impl/src/com/intellij/openapi/util/registry/RegistryExtensionCollector.kt @@ -7,6 +7,7 @@ import com.intellij.openapi.extensions.PluginAware import com.intellij.openapi.extensions.PluginDescriptor import com.intellij.openapi.util.text.StringUtil import com.intellij.util.xmlb.annotations.Attribute +import com.intellij.util.xmlb.annotations.Transient /** * @author yole @@ -17,21 +18,23 @@ class RegistryKeyBean : PluginAware { @JvmField @Attribute("defaultValue") val defaultValue: String = "" @JvmField @Attribute("restartRequired") val restartRequired: Boolean = false + @Transient var pluginDescriptor: PluginDescriptor? = null private set + @Transient override fun setPluginDescriptor(pluginDescriptor: PluginDescriptor?) { this.pluginDescriptor = pluginDescriptor } companion object { - val EP_NAME = ExtensionPointName.create("com.intellij.registryKey") + val EP_NAME = ExtensionPointName("com.intellij.registryKey") } } class RegistryExtensionCollector { init { - for (extension in RegistryKeyBean.EP_NAME.extensions) { + for (extension in RegistryKeyBean.EP_NAME.extensionList) { val contributedByThirdParty = extension.pluginDescriptor?.let { !getPluginInfoById(it.pluginId).isSafeToReport() } ?: false Registry.addKey(extension.key, extension.description.unescapeString(), extension.defaultValue, extension.restartRequired, contributedByThirdParty)