From d2972314bc650180a10da55a3b7d76644ecaf702 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 30 Aug 2017 14:40:13 +0200
Subject: [PATCH] Remove duplicate version detection code from
 AddKotlinLibQuickFix

---
 .../idea/inspections/AddKotlinLibQuickFix.kt  | 42 ++-----------------
 .../addKotlinReflect/build.gradle             |  3 ++
 .../addKotlinReflect/build.gradle.after       |  3 ++
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/AddKotlinLibQuickFix.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/AddKotlinLibQuickFix.kt
index 9435064f07f..9c5aeb61268 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/AddKotlinLibQuickFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/AddKotlinLibQuickFix.kt
@@ -22,14 +22,12 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ExternalLibraryDescriptor
 import com.intellij.openapi.roots.ProjectRootManager
-import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.KotlinPluginUtil
-import org.jetbrains.kotlin.idea.configuration.KotlinWithGradleConfigurator
 import org.jetbrains.kotlin.idea.configuration.findApplicableConfigurator
+import org.jetbrains.kotlin.idea.facet.getRuntimeLibraryVersion
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.quickfix.quickfixUtil.createIntentionForFirstParentOfType
@@ -47,7 +45,7 @@ class AddReflectionQuickFix(element: KtElement)
     override fun getFamilyName() = text
 
     override fun getLibraryDescriptor(module: Module) = MavenExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect",
-                                                                                       AddKotlinLibQuickFix.getKotlinStdlibVersion(module))
+                                                                                       getRuntimeLibraryVersion(module) ?: bundledRuntimeVersion())
 
     companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) = diagnostic.createIntentionForFirstParentOfType(::AddReflectionQuickFix)
@@ -61,7 +59,7 @@ class AddTestLibQuickFix(element: KtElement)
     override fun getFamilyName() = text
 
     override fun getLibraryDescriptor(module: Module) = MavenExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-test",
-                                                                                       AddKotlinLibQuickFix.getKotlinStdlibVersion(module))
+                                                                                       getRuntimeLibraryVersion(module) ?: bundledRuntimeVersion())
 
     companion object : KotlinSingleIntentionActionFactory() {
         val KOTLIN_TEST_UNRESOLVED = setOf(
@@ -122,38 +120,4 @@ abstract class AddKotlinLibQuickFix(element: KtElement,
         val configurator = findApplicableConfigurator(module)
         configurator.addLibraryDependency(module, element, getLibraryDescriptor(module), libraryJarDescriptors)
     }
-
-    companion object {
-        fun getKotlinStdlibVersion(module: Module): String {
-            if (KotlinPluginUtil.isMavenModule(module)) {
-                val mavenVersion = getMavenKotlinStdlibVersion(module)
-                if (mavenVersion != null) {
-                    return mavenVersion
-                }
-            }
-            else if (KotlinPluginUtil.isGradleModule(module) || KotlinPluginUtil.isAndroidGradleModule(module)) {
-                val gradleVersion = KotlinWithGradleConfigurator.getKotlinStdlibVersion(module)
-                if (gradleVersion != null) {
-                    return gradleVersion
-                }
-            }
-
-            val pluginVersion = bundledRuntimeVersion()
-            if ("@snapshot@" == pluginVersion) {
-                return "1.1-SNAPSHOT"
-            }
-            return pluginVersion
-        }
-
-        fun getMavenKotlinStdlibVersion(module: Module): String? {
-            LibrariesContainerFactory.createContainer(module).allLibraries.forEach { library ->
-                val libName = library.name
-                if (libName != null && libName.contains("org.jetbrains.kotlin:kotlin-stdlib")) {
-                    return libName.substringAfterLast(":")
-                }
-            }
-
-            return null
-        }
-    }
 }
\ No newline at end of file
diff --git a/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle b/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle
index 846876a724c..d1ad58d519e 100644
--- a/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle
+++ b/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle
@@ -13,6 +13,9 @@ buildscript {
 
 apply plugin: 'kotlin'
 
+repositories {
+    mavenCentral()
+}
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
 }
diff --git a/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle.after b/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle.after
index b702695295b..25b491b228f 100644
--- a/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle.after
+++ b/idea/testData/gradle/languageFeature/addKotlinReflect/build.gradle.after
@@ -13,6 +13,9 @@ buildscript {
 
 apply plugin: 'kotlin'
 
+repositories {
+    mavenCentral()
+}
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
     compile "org.jetbrains.kotlin:kotlin-reflect:1.1.0"