From 480434deb0fdd3cec57aa5fc40ac586cd971aba7 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 2 Sep 2015 08:51:29 +0200 Subject: [PATCH] use.loaded.state.as.existing, default false until client issues are not fixed. --- platform/configuration-store-impl/src/XmlElementStorage.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/configuration-store-impl/src/XmlElementStorage.kt b/platform/configuration-store-impl/src/XmlElementStorage.kt index 67bed1a75dac..08f77b834051 100644 --- a/platform/configuration-store-impl/src/XmlElementStorage.kt +++ b/platform/configuration-store-impl/src/XmlElementStorage.kt @@ -20,6 +20,7 @@ import com.intellij.openapi.components.StateStorage import com.intellij.openapi.components.TrackingPathMacroSubstitutor import com.intellij.openapi.components.impl.stores.FileStorageCoreUtil import com.intellij.openapi.util.JDOMUtil +import com.intellij.openapi.util.registry.Registry import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.SmartHashSet import gnu.trove.THashMap @@ -37,7 +38,9 @@ abstract class XmlElementStorage protected constructor(protected val fileSpec: S protected abstract fun loadLocalData(): Element? - override final fun getState(storageData: StateMap, component: Any?, componentName: String) = storageData.getState(componentName) + override final fun getState(storageData: StateMap, component: Any?, componentName: String): Element? { + return if (Registry.`is`("use.loaded.state.as.existing", false)) storageData.getState(componentName) else storageData.getStateAndArchive(componentName) + } override fun archiveState(storageData: StateMap, componentName: String, serializedState: Element?) { storageData.archive(componentName, serializedState)