From 198b054a6f2eeaaf3b0d760b229ddb955b4e9f34 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Wed, 7 Feb 2018 11:42:14 +0300
Subject: [PATCH] Detect library kind in Gradle if name looks like non-JVM

Related to KT-20971
---
 .../idea/configuration/KotlinGradleSourceSetDataService.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 5aa22ce48c7..4a107008021 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
@@ -26,7 +26,6 @@ import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsPr
 import com.intellij.openapi.externalSystem.service.project.manage.AbstractProjectDataService
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.module.Module
-import com.intellij.openapi.module.isQualifiedModuleNamesEnabled
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.roots.impl.libraries.LibraryEx
@@ -121,7 +120,7 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
             val ideLibrary = modelsProvider.findIdeLibrary(libraryDataNode.data) ?: continue
 
             val modifiableModel = modelsProvider.getModifiableLibraryModel(ideLibrary) as LibraryEx.ModifiableModelEx
-            if (anyNonJvmModules) {
+            if (anyNonJvmModules || ideLibrary.name?.looksAsNonJvmLibraryName() == true) {
                 detectLibraryKind(modifiableModel.getFiles(OrderRootType.CLASSES))?.let { modifiableModel.kind = it }
             }
             else if (ideLibrary is LibraryImpl && (ideLibrary.kind is JSLibraryKind || ideLibrary.kind is CommonLibraryKind)) {
@@ -130,6 +129,8 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
         }
     }
 
+    private fun String.looksAsNonJvmLibraryName() = nonJvmSuffixes.any { it in this }
+
     private fun resetLibraryKind(modifiableModel: LibraryEx.ModifiableModelEx) {
         try {
             val cls = LibraryImpl::class.java
@@ -150,6 +151,8 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
 
     companion object {
         val LOG = Logger.getInstance(KotlinGradleLibraryDataService::class.java)
+
+        val nonJvmSuffixes = listOf("-common", "-js", "-native", "-kjsm")
     }
 }