From 39599fc7c9745bfa687358d131613a68ce1ee0e1 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 16 Aug 2017 18:26:40 +0200
Subject: [PATCH] Don't detect library kind for pure JVM projects

Also require .kjsm to detect JS libraries; don't detect jars containing
only .js files as JS libraries

 #KT-19717 Fixed
---
 .../src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt     | 2 +-
 .../idea/configuration/KotlinGradleSourceSetDataService.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
index e678de75c97..f05ef58dfec 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
@@ -84,7 +84,7 @@ private fun detectLibraryKindFromJarContents(jarRoot: VirtualFile): PersistentLi
                 when (file.extension) {
                     "class" -> false
 
-                    "js", "kjsm" -> {
+                    "kjsm" -> {
                         result = JSLibraryKind
                         false
                     }
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 84d9eb72642..c3e604328fc 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
@@ -109,7 +109,7 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
         if (toImport.isEmpty()) return
         val projectDataNode = toImport.first().parent!! as DataNode<ProjectData>
         val moduleDataNodes = projectDataNode.children.filter { it.data is ModuleData } as List<DataNode<ModuleData>>
-        if (moduleDataNodes.any { detectPlatformByPlugin(it) != null}) {
+        if (moduleDataNodes.any { detectPlatformByPlugin(it)?.takeIf { it !is TargetPlatformKind.Jvm } != null }) {
             for (libraryDataNode in toImport) {
                 val ideLibrary = modelsProvider.findIdeLibrary(libraryDataNode.data) ?: continue