From feea1f554a7feccbf09cb6d0b20132129bf273d1 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Thu, 7 Jul 2016 17:27:52 +0300
Subject: [PATCH] Refactoring: extract strings

---
 .../configuration/KotlinWithGradleConfigurator.java    |  5 ++++-
 .../gradle/DifferentKotlinGradleVersionInspection.kt   | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
index 2a4b552be2e..7b3f817c943 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java
@@ -57,7 +57,10 @@ import java.util.Set;
 public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfigurator {
     private static final String VERSION_TEMPLATE = "$VERSION$";
 
-    protected static final String CLASSPATH = "classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\"";
+    public static final String GROUP_ID = "org.jetbrains.kotlin";
+    public static final String GRADLE_PLUGIN_ID = "kotlin-gradle-plugin";
+
+    protected static final String CLASSPATH = "classpath \"" + GROUP_ID + ":" + GRADLE_PLUGIN_ID + ":kotlin-gradle-plugin:$kotlin_version\"";
 
     protected static final String SNAPSHOT_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.SNAPSHOT_REPOSITORY.getUrl() + "'\n}";
     protected static final String EAP_REPOSITORY = "maven {\nurl '" + ConfigureKotlinInProjectUtilsKt.EAP_REPOSITORY.getUrl() + "'\n}";
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentKotlinGradleVersionInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentKotlinGradleVersionInspection.kt
index 8446881fdab..2a1b461fa87 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentKotlinGradleVersionInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/gradle/DifferentKotlinGradleVersionInspection.kt
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.io.FileUtilRt
 import com.intellij.util.BooleanFunction
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.idea.KotlinPluginUtil
+import org.jetbrains.kotlin.idea.configuration.KotlinWithGradleConfigurator
 import org.jetbrains.kotlin.idea.framework.GRADLE_SYSTEM_ID
 import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion
 import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
@@ -86,7 +87,7 @@ class DifferentKotlinGradleVersionInspection : GradleBaseInspection() {
             if (buildScriptCall.invokedExpression.text != "buildscript") return
 
             val kotlinPluginStatement = findClassPathStatements(closure).filter {
-                it.text.contains("org.jetbrains.kotlin:kotlin-gradle-plugin:")
+                it.text.contains(KOTLIN_PLUGIN_CLASSPATH_MARKER)
             }.firstOrNull() ?: return
 
             val kotlinPluginVersion =
@@ -101,6 +102,9 @@ class DifferentKotlinGradleVersionInspection : GradleBaseInspection() {
     }
 
     companion object {
+        val KOTLIN_PLUGIN_CLASSPATH_MARKER = "${KotlinWithGradleConfigurator.GROUP_ID}:${KotlinWithGradleConfigurator.GRADLE_PLUGIN_ID}:"
+        val KOTLIN_PLUGIN_PATH_MARKER = "${KotlinWithGradleConfigurator.GROUP_ID}/${KotlinWithGradleConfigurator.GRADLE_PLUGIN_ID}/"
+
         private fun getHeuristicKotlinPluginVersion(classpathStatement: GrCallExpression): String? {
             val argument = classpathStatement.getChildrenOfType<GrCommandArgumentList>().firstOrNull() ?: return null
             val grLiteral = argument.children.firstOrNull()?.let { it as? GrLiteral } ?: return null
@@ -183,8 +187,8 @@ class DifferentKotlinGradleVersionInspection : GradleBaseInspection() {
             for (classPathEntry in classpathData.classpathEntries) {
                 for (path in classPathEntry.classesFile) {
                     val uniformedPath = path.replace('\\', '/')
-                    if (uniformedPath.contains("org.jetbrains.kotlin/kotlin-gradle-plugin/")) {
-                        val versionSubstring = uniformedPath.substringAfter("org.jetbrains.kotlin/kotlin-gradle-plugin/").substringBefore('/', "<error>")
+                    if (uniformedPath.contains(KOTLIN_PLUGIN_PATH_MARKER)) {
+                        val versionSubstring = uniformedPath.substringAfter(KOTLIN_PLUGIN_PATH_MARKER).substringBefore('/', "<error>")
                         if (versionSubstring != "<error>") {
                             return versionSubstring;
                         }