From e1463f9e0f2dc55efd855389cde986cf1eff102a Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 14 Feb 2017 18:24:22 +0300
Subject: [PATCH] Kotlin Facet: Fix detection of pre-1.1-beta JS-stdlib
 dependencies

---
 .../jetbrains/kotlin/idea/facet/facetUtils.kt |  2 +-
 .../idea/versions/KotlinRuntimeLibraryUtil.kt |  1 +
 .../gradle/GradleFacetImportTest.kt           | 32 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
index c882f473921..12530acb04f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
@@ -150,7 +150,7 @@ fun KotlinFacetSettings.initializeIfNeeded(module: Module, rootModel: ModuleRoot
 val TargetPlatformKind<*>.mavenLibraryIds: List<String>
     get() = when (this) {
         is TargetPlatformKind.Jvm -> listOf(MAVEN_STDLIB_ID, MAVEN_STDLIB_ID_JRE7, MAVEN_STDLIB_ID_JRE8)
-        is TargetPlatformKind.JavaScript -> listOf(MAVEN_JS_STDLIB_ID)
+        is TargetPlatformKind.JavaScript -> listOf(MAVEN_JS_STDLIB_ID, MAVEN_OLD_JS_STDLIB_ID)
         is TargetPlatformKind.Common -> listOf(MAVEN_COMMON_STDLIB_ID)
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
index 8fb347b4c94..dbcc4edb0b5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
@@ -296,4 +296,5 @@ val MAVEN_STDLIB_ID = "kotlin-stdlib"
 val MAVEN_STDLIB_ID_JRE7 = "kotlin-stdlib-jre7"
 val MAVEN_STDLIB_ID_JRE8 = "kotlin-stdlib-jre8"
 val MAVEN_JS_STDLIB_ID = "kotlin-stdlib-js"
+val MAVEN_OLD_JS_STDLIB_ID = "kotlin-js-library"
 val MAVEN_COMMON_STDLIB_ID = "kotlin-stdlib-common" // TODO: KotlinCommonMavenConfigurator
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
index bfbfade9db4..10d50c1d161 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
@@ -233,6 +233,38 @@ class GradleFacetImportTest : GradleImportingTestCase() {
         }
     }*/
 
+    @Test
+    fun testDetectOldJsStdlib() {
+        createProjectSubFile("build.gradle", """
+            group 'Again'
+            version '1.0-SNAPSHOT'
+
+            buildscript {
+                repositories {
+                    mavenCentral()
+                    maven {
+                        url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1'
+                    }
+                }
+
+                dependencies {
+                    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.6")
+                }
+            }
+
+            apply plugin: 'kotlin2js'
+
+            dependencies {
+                compile "org.jetbrains.kotlin:kotlin-js-library:1.0.6"
+            }
+        """)
+        importProject()
+
+        with (facetSettings) {
+            Assert.assertEquals(TargetPlatformKind.JavaScript, versionInfo.targetPlatformKind)
+        }
+    }
+
     @Test
     fun testCommonImport() {
         createProjectSubFile("build.gradle", """