From 843a9871b100e22b8f471f3a10a2409216e1e180 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 29 Aug 2017 10:29:22 +0200
Subject: [PATCH] Detect library kind field based on type, not name

---
 .../KotlinGradleSourceSetDataService.kt             | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
index c36d138680c..22390413c82 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt
@@ -31,6 +31,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.roots.impl.libraries.LibraryEx
 import com.intellij.openapi.roots.impl.libraries.LibraryImpl
+import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.config.CoroutineSupport
@@ -130,9 +131,15 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
     private fun resetLibraryKind(modifiableModel: LibraryEx.ModifiableModelEx) {
         try {
             val cls = LibraryImpl::class.java
-            val declaredField = cls.getDeclaredField("myKind")
-            declaredField.isAccessible = true
-            declaredField.set(modifiableModel, null)
+            // Don't use name-based lookup because field names are scrambled in IDEA Ultimate
+            for (field in cls.declaredFields) {
+                if (field.type == PersistentLibraryKind::class.java) {
+                    field.isAccessible = true
+                    field.set(modifiableModel, null)
+                    return
+                }
+            }
+            LOG.info("Could not find field of type PersistentLibraryKind in LibraryImpl.class")
         }
         catch (e: Exception) {
             LOG.info("Failed to reset library kind", e)