From 05b618eec890dbac7382dc51bc21769f6007eed6 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 11 Jan 2018 15:45:26 +0300
Subject: [PATCH] Gradle: Use copyable user data for compiler plugin options

 #KT-22227 Fixed
---
 .../src/AbstractGradleImportHandler.kt                          | 2 +-
 .../src/AnnotationBasedPluginProjectResolverExtension.kt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/annotation-based-compiler-plugins-ide-support/src/AbstractGradleImportHandler.kt b/plugins/annotation-based-compiler-plugins-ide-support/src/AbstractGradleImportHandler.kt
index 9fc95fda3a2..e1a45084334 100644
--- a/plugins/annotation-based-compiler-plugins-ide-support/src/AbstractGradleImportHandler.kt
+++ b/plugins/annotation-based-compiler-plugins-ide-support/src/AbstractGradleImportHandler.kt
@@ -54,7 +54,7 @@ abstract class AbstractGradleImportHandler<T : AnnotationBasedPluginModel> : Gra
     private fun getPluginSetupByModule(
             moduleNode: DataNode<ModuleData>
     ): AnnotationBasedCompilerPluginSetup? {
-        val pluginModel = moduleNode.getUserData(modelKey)?.takeIf { it.isEnabled } ?: return null
+        val pluginModel = moduleNode.getCopyableUserData(modelKey)?.takeIf { it.isEnabled } ?: return null
         val annotations = pluginModel.annotations
         val presets = pluginModel.presets
 
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 481f98b0df1..b2d57495822 100644
--- a/plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt
+++ b/plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedPluginProjectResolverExtension.kt
@@ -56,7 +56,7 @@ abstract class AnnotationBasedPluginProjectResolverExtension<T : AnnotationBased
         val model = resolverCtx.getExtraProject(gradleModule, modelClass)
 
         if (model != null) {
-            ideModule.putUserData(userDataKey, model)
+            ideModule.putCopyableUserData(userDataKey, model)
         }
 
         super.populateModuleExtraModels(gradleModule, ideModule)