From 099f3f3ddf7c1896bd0727430d8fa486d0faa9df Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 26 Jun 2018 19:32:56 +0300
Subject: [PATCH] Move isEap and isDev utility functions to idea module

---
 .../configuration/ConfigureKotlinInProjectUtils.kt | 10 ++--------
 .../ui/ConfigureDialogWithModulesAndVersion.java   |  3 ++-
 .../org/jetbrains/kotlin/idea/util/versioning.kt   | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/util/versioning.kt

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
index 37ad6604a21..9a40074ae92 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.idea.framework.effectiveKind
 import org.jetbrains.kotlin.idea.quickfix.KotlinAddRequiredModuleFix
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.findFirstPsiJavaModule
+import org.jetbrains.kotlin.idea.util.isDev
+import org.jetbrains.kotlin.idea.util.isEap
 import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import org.jetbrains.kotlin.idea.util.projectStructure.sdk
 import org.jetbrains.kotlin.idea.util.projectStructure.version
@@ -284,14 +286,6 @@ fun hasKotlinFilesInSources(module: Module): Boolean {
     return FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(false))
 }
 
-fun isEap(version: String): Boolean {
-    return version.contains("rc") || version.contains("eap") || version.contains("-M")
-}
-
-fun isDev(version: String): Boolean {
-    return version.contains("dev")
-}
-
 private class LibraryKindSearchScope(val module: Module,
                                      val baseScope: GlobalSearchScope,
                                      val libraryKind: PersistentLibraryKind<*>
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
index 4e6f028812e..1ca42029223 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtilsKt;
 import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator;
 import org.jetbrains.kotlin.idea.configuration.RepositoryDescription;
+import org.jetbrains.kotlin.idea.util.VersioningKt;
 import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt;
 
 import javax.swing.*;
@@ -222,7 +223,7 @@ public class ConfigureDialogWithModulesAndVersion extends DialogWrapper {
         Collections.sort(versions, VersionComparatorUtil.COMPARATOR.reversed());
 
         // Handle the case when the new version has just been released and the Maven search index hasn't been updated yet
-        if (!ConfigureKotlinInProjectUtilsKt.isEap(bundledRuntimeVersion) && !KotlinPluginUtil.isSnapshotVersion() &&
+        if (!VersioningKt.isEap(bundledRuntimeVersion) && !KotlinPluginUtil.isSnapshotVersion() &&
             !bundledRuntimeVersion.contains("dev") && !versions.contains(bundledRuntimeVersion)) {
             versions.add(0, bundledRuntimeVersion);
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/versioning.kt b/idea/src/org/jetbrains/kotlin/idea/util/versioning.kt
new file mode 100644
index 00000000000..718950aaf51
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/util/versioning.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.util
+
+fun isEap(version: String): Boolean {
+    return version.contains("rc") || version.contains("eap") || version.contains("-M")
+}
+
+fun isDev(version: String): Boolean {
+    return version.contains("dev")
+}
\ No newline at end of file