Move isEap and isDev utility functions to idea module
This commit is contained in:
+2
-8
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.idea.framework.effectiveKind
|
|||||||
import org.jetbrains.kotlin.idea.quickfix.KotlinAddRequiredModuleFix
|
import org.jetbrains.kotlin.idea.quickfix.KotlinAddRequiredModuleFix
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
import org.jetbrains.kotlin.idea.util.findFirstPsiJavaModule
|
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.allModules
|
||||||
import org.jetbrains.kotlin.idea.util.projectStructure.sdk
|
import org.jetbrains.kotlin.idea.util.projectStructure.sdk
|
||||||
import org.jetbrains.kotlin.idea.util.projectStructure.version
|
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))
|
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,
|
private class LibraryKindSearchScope(val module: Module,
|
||||||
val baseScope: GlobalSearchScope,
|
val baseScope: GlobalSearchScope,
|
||||||
val libraryKind: PersistentLibraryKind<*>
|
val libraryKind: PersistentLibraryKind<*>
|
||||||
|
|||||||
+2
-1
@@ -39,6 +39,7 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil;
|
|||||||
import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtilsKt;
|
import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtilsKt;
|
||||||
import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator;
|
import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator;
|
||||||
import org.jetbrains.kotlin.idea.configuration.RepositoryDescription;
|
import org.jetbrains.kotlin.idea.configuration.RepositoryDescription;
|
||||||
|
import org.jetbrains.kotlin.idea.util.VersioningKt;
|
||||||
import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt;
|
import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtilKt;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@@ -222,7 +223,7 @@ public class ConfigureDialogWithModulesAndVersion extends DialogWrapper {
|
|||||||
Collections.sort(versions, VersionComparatorUtil.COMPARATOR.reversed());
|
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
|
// 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)) {
|
!bundledRuntimeVersion.contains("dev") && !versions.contains(bundledRuntimeVersion)) {
|
||||||
versions.add(0, bundledRuntimeVersion);
|
versions.add(0, bundledRuntimeVersion);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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")
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user