From 20cb4e91b35a952ea89e86866bde89646cfed6f2 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 16 May 2018 00:14:19 +0300
Subject: [PATCH] Do not retain proxy-based components for compiler plugin
 settings in project model

---
 .../allopen/allopen-ide/src/AllOpenModelBuilderService.kt   | 6 +++++-
 .../src/AnnotationBasedPluginProjectResolverExtension.kt    | 4 +++-
 plugins/noarg/noarg-ide/src/NoArgModelBuilderService.kt     | 4 ++++
 .../src/SamWithReceiverModelBuilderService.kt               | 6 +++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/allopen/allopen-ide/src/AllOpenModelBuilderService.kt b/plugins/allopen/allopen-ide/src/AllOpenModelBuilderService.kt
index 8c40f2c7023..65bf3740d5a 100644
--- a/plugins/allopen/allopen-ide/src/AllOpenModelBuilderService.kt
+++ b/plugins/allopen/allopen-ide/src/AllOpenModelBuilderService.kt
@@ -21,7 +21,11 @@ import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginModel
 import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginModelBuilderService
 import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginProjectResolverExtension
 
-interface AllOpenModel : AnnotationBasedPluginModel
+interface AllOpenModel : AnnotationBasedPluginModel {
+    override fun copy(): AllOpenModel {
+        return AllOpenModelImpl(annotations.toList(), presets.toList())
+    }
+}
 
 class AllOpenModelImpl(
         override val annotations: List<String>,
diff --git a/plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt b/plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt
index b2d57495822..7a68f2ddba2 100644
--- a/plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt
+++ b/plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt
@@ -33,6 +33,8 @@ interface AnnotationBasedPluginModel : Serializable {
     val annotations: List<String>
     val presets: List<String>
 
+    fun copy(): AnnotationBasedPluginModel
+
     val isEnabled get() = annotations.isNotEmpty() || presets.isNotEmpty()
 }
 
@@ -56,7 +58,7 @@ abstract class AnnotationBasedPluginProjectResolverExtension<T : AnnotationBased
         val model = resolverCtx.getExtraProject(gradleModule, modelClass)
 
         if (model != null) {
-            ideModule.putCopyableUserData(userDataKey, model)
+            ideModule.putCopyableUserData(userDataKey, model.copy() as T)
         }
 
         super.populateModuleExtraModels(gradleModule, ideModule)
diff --git a/plugins/noarg/noarg-ide/src/NoArgModelBuilderService.kt b/plugins/noarg/noarg-ide/src/NoArgModelBuilderService.kt
index 3f1023fdd9f..e2980b11ab8 100644
--- a/plugins/noarg/noarg-ide/src/NoArgModelBuilderService.kt
+++ b/plugins/noarg/noarg-ide/src/NoArgModelBuilderService.kt
@@ -23,6 +23,10 @@ import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginProjectRe
 
 interface NoArgModel : AnnotationBasedPluginModel {
     val invokeInitializers: Boolean
+
+    override fun copy(): NoArgModel {
+        return NoArgModelImpl(annotations.toList(), presets.toList(), invokeInitializers)
+    }
 }
 
 class NoArgModelImpl(
diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/src/SamWithReceiverModelBuilderService.kt b/plugins/sam-with-receiver/sam-with-receiver-ide/src/SamWithReceiverModelBuilderService.kt
index 7bba8aeb850..7c3728ce5dd 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-ide/src/SamWithReceiverModelBuilderService.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-ide/src/SamWithReceiverModelBuilderService.kt
@@ -21,7 +21,11 @@ import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginModel
 import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginModelBuilderService
 import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedPluginProjectResolverExtension
 
-interface SamWithReceiverModel : AnnotationBasedPluginModel
+interface SamWithReceiverModel : AnnotationBasedPluginModel {
+    override fun copy(): SamWithReceiverModel {
+        return SamWithReceiverModelImpl(annotations.toList(), presets.toList())
+    }
+}
 
 class SamWithReceiverModelImpl(
         override val annotations: List<String>,