From 43db7f820431fb76ceecd11f62bb9fa1d6820860 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 3 Aug 2018 23:22:35 +0200
Subject: [PATCH] =?UTF-8?q?IDEA-CR-35561=20if=20empty=20state=20loaded=20?=
 =?UTF-8?q?=E2=80=94=20simply=20clear=20mappings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/intellij/lang/PerFileMappingsBase.java        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/lang/PerFileMappingsBase.java b/platform/platform-api/src/com/intellij/lang/PerFileMappingsBase.java
index aaaca1d8c5f9..0ed8a93f0d1f 100644
--- a/platform/platform-api/src/com/intellij/lang/PerFileMappingsBase.java
+++ b/platform/platform-api/src/com/intellij/lang/PerFileMappingsBase.java
@@ -252,7 +252,13 @@ public abstract class PerFileMappingsBase<T> implements PersistentStateComponent
     @SuppressWarnings("deprecation")
     List<PerFileMappingState> list = PerFileMappingState.read(element, getValueAttribute());
     synchronized (myMappings) {
-      myDeferredMappings = list;
+      if (list.isEmpty()) {
+        myMappings.clear();
+        myDeferredMappings = null;
+      }
+      else {
+        myDeferredMappings = list;
+      }
     }
   }