From c6a17f551730b7f7817fdb78cfbc330e29b208b3 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 28 Oct 2016 16:44:41 +0200
Subject: [PATCH] IDEA-163238 Synchronize settings make the IDE unusable

---
 platform/configuration-store-impl/src/SchemeManagerImpl.kt  | 2 ++
 .../openapi/editor/colors/impl/EditorColorsManagerImpl.java | 6 ++++++
 .../src/com/intellij/configurationStore/scheme-impl.kt      | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/platform/configuration-store-impl/src/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
index 10ab7e57b96c..66415f2257e4 100644
--- a/platform/configuration-store-impl/src/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
@@ -334,6 +334,8 @@ class SchemeManagerImpl<T : Scheme, MUTABLE_SCHEME : T>(val fileSpec: String,
     removeExternalizableSchemes()
 
     loadSchemes()
+
+    (processor as? LazySchemeProcessor)?.reloaded()
   }
 
   private fun removeExternalizableSchemes() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
index 3286f71529c2..54d93ca25839 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
@@ -135,6 +135,12 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Pers
 
         return scheme.isEqualToBundled(bundledScheme);
       }
+
+      @Override
+      public void reloaded() {
+        initEditableDefaultSchemesCopies();
+        initEditableBundledSchemesCopies();
+      }
     }
     mySchemeManager = schemeManagerFactory.create(FILE_SPEC, new EditorColorSchemeProcessor());
 
diff --git a/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt b/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt
index d152cce89576..50044ee63459 100644
--- a/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt
+++ b/platform/projectModel-impl/src/com/intellij/configurationStore/scheme-impl.kt
@@ -69,6 +69,9 @@ abstract class LazySchemeProcessor<SCHEME : Scheme, MUTABLE_SCHEME : SCHEME>(pri
   open fun isSchemeDefault(scheme: MUTABLE_SCHEME, digest: ByteArray) = false
 
   open fun isSchemeEqualToBundled(scheme: MUTABLE_SCHEME) = false
+
+  open fun reloaded() {
+  }
 }
 
 class DigestOutputStream(val digest: MessageDigest) : OutputStream() {