From e5a3feada460b433e8d69354accfe6313ca9eb9f Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 29 Oct 2018 13:52:43 +0700
Subject: [PATCH] Disable ProjectRootModificationTrackerFixer in IDEA 183+

Issue #KT-27579 Fixed
---
 .../idea/caches/ProjectRootModificationTrackerFixer.kt     | 2 +-
 idea/src/META-INF/plugin-common.xml                        | 3 ---
 idea/src/META-INF/plugin.xml                               | 7 +++++++
 idea/src/META-INF/plugin.xml.173                           | 7 +++++++
 idea/src/META-INF/plugin.xml.181                           | 7 +++++++
 idea/src/META-INF/plugin.xml.as31                          | 7 +++++++
 idea/src/META-INF/plugin.xml.as32                          | 7 +++++++
 idea/src/META-INF/plugin.xml.as33                          | 7 +++++++
 8 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/ProjectRootModificationTrackerFixer.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/ProjectRootModificationTrackerFixer.kt
index 8b42b077def..7dd8892c982 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/ProjectRootModificationTrackerFixer.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/ProjectRootModificationTrackerFixer.kt
@@ -12,7 +12,7 @@ import com.intellij.openapi.roots.ModuleRootEvent
 import com.intellij.openapi.roots.ModuleRootListener
 import com.intellij.openapi.roots.ProjectRootManager
 
-// This is a workaround until IDEA-200525 is fixed.
+// This is a workaround for IDEA < 183. For details, see IDEA-200525.
 class ProjectRootModificationTrackerFixer(val project: Project) : ProjectComponent {
     override fun initComponent() {
         project.messageBus.connect(project).subscribe(
diff --git a/idea/src/META-INF/plugin-common.xml b/idea/src/META-INF/plugin-common.xml
index 301be89cf49..0f6accf2392 100644
--- a/idea/src/META-INF/plugin-common.xml
+++ b/idea/src/META-INF/plugin-common.xml
@@ -26,9 +26,6 @@
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.configuration.KotlinMigrationProjectComponent</implementation-class>
     </component>
-    <component>
-      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
-    </component>
   </project-components>
 
   <application-components>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index fb3ce629ac0..56b53dbdf1d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -55,6 +55,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="kotlinx-serialization.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
+  <project-components>
+    <component>
+      <!-- This is a workaround for IDEA < 183. For details, see IDEA-200525. -->
+      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
 
diff --git a/idea/src/META-INF/plugin.xml.173 b/idea/src/META-INF/plugin.xml.173
index 1c3b4935607..26a92861521 100644
--- a/idea/src/META-INF/plugin.xml.173
+++ b/idea/src/META-INF/plugin.xml.173
@@ -50,6 +50,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
+  <project-components>
+    <component>
+      <!-- This is a workaround for IDEA < 183. For details, see IDEA-200525. -->
+      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
 
diff --git a/idea/src/META-INF/plugin.xml.181 b/idea/src/META-INF/plugin.xml.181
index 6b44c58dca0..b5c8527a85c 100644
--- a/idea/src/META-INF/plugin.xml.181
+++ b/idea/src/META-INF/plugin.xml.181
@@ -51,6 +51,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
+  <project-components>
+    <component>
+      <!-- This is a workaround for IDEA < 183. For details, see IDEA-200525. -->
+      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
 
diff --git a/idea/src/META-INF/plugin.xml.as31 b/idea/src/META-INF/plugin.xml.as31
index a69076e5a17..26898b65dd7 100644
--- a/idea/src/META-INF/plugin.xml.as31
+++ b/idea/src/META-INF/plugin.xml.as31
@@ -50,6 +50,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
+  <project-components>
+    <component>
+      <!-- This is a workaround for IDEA < 183. For details, see IDEA-200525. -->
+      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
 
diff --git a/idea/src/META-INF/plugin.xml.as32 b/idea/src/META-INF/plugin.xml.as32
index 9be0a188d31..fdadad86497 100644
--- a/idea/src/META-INF/plugin.xml.as32
+++ b/idea/src/META-INF/plugin.xml.as32
@@ -53,6 +53,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="kotlinx-serialization.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
+  <project-components>
+    <component>
+      <!-- This is a workaround for IDEA < 183. For details, see IDEA-200525. -->
+      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
 
diff --git a/idea/src/META-INF/plugin.xml.as33 b/idea/src/META-INF/plugin.xml.as33
index a3378866953..103f6fc4960 100644
--- a/idea/src/META-INF/plugin.xml.as33
+++ b/idea/src/META-INF/plugin.xml.as33
@@ -54,6 +54,13 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <xi:include href="kotlinx-serialization.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
+  <project-components>
+    <component>
+      <!-- This is a workaround for IDEA < 183. For details, see IDEA-200525. -->
+      <implementation-class>org.jetbrains.kotlin.idea.caches.ProjectRootModificationTrackerFixer</implementation-class>
+    </component>
+  </project-components>
+
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>