Refactoring: move isSnapshot function closer to similar ones
This commit is contained in:
+1
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
|||||||
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
||||||
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
|
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
|
||||||
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
|
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
|
||||||
|
import org.jetbrains.kotlin.idea.util.isSnapshot
|
||||||
import org.jetbrains.kotlin.idea.versions.*
|
import org.jetbrains.kotlin.idea.versions.*
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
|
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
|
||||||
|
|||||||
+1
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
|||||||
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
||||||
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
|
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
|
||||||
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
|
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
|
||||||
|
import org.jetbrains.kotlin.idea.util.isSnapshot
|
||||||
import org.jetbrains.kotlin.idea.versions.*
|
import org.jetbrains.kotlin.idea.versions.*
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
|
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.idea.util.projectStructure.sdk
|
|||||||
import org.jetbrains.kotlin.idea.util.projectStructure.version
|
import org.jetbrains.kotlin.idea.util.projectStructure.version
|
||||||
import org.jetbrains.kotlin.idea.versions.SuppressNotificationState
|
import org.jetbrains.kotlin.idea.versions.SuppressNotificationState
|
||||||
import org.jetbrains.kotlin.idea.versions.hasKotlinJsKjsmFile
|
import org.jetbrains.kotlin.idea.versions.hasKotlinJsKjsmFile
|
||||||
import org.jetbrains.kotlin.idea.versions.isSnapshot
|
import org.jetbrains.kotlin.idea.util.isSnapshot
|
||||||
import org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinder
|
import org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinder
|
||||||
import org.jetbrains.kotlin.resolve.jvm.modules.KOTLIN_STDLIB_MODULE_NAME
|
import org.jetbrains.kotlin.resolve.jvm.modules.KOTLIN_STDLIB_MODULE_NAME
|
||||||
import org.jetbrains.kotlin.utils.ifEmpty
|
import org.jetbrains.kotlin.utils.ifEmpty
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ fun isDev(version: String): Boolean {
|
|||||||
return version.contains("dev")
|
return version.contains("dev")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isSnapshot(version: String): Boolean {
|
||||||
|
return version.contains("SNAPSHOT", ignoreCase = true)
|
||||||
|
}
|
||||||
|
|
||||||
val buildNumber: String by lazy {
|
val buildNumber: String by lazy {
|
||||||
val file = File(PathUtil.kotlinPathsForIdeaPlugin.homePath, "build.txt")
|
val file = File(PathUtil.kotlinPathsForIdeaPlugin.homePath, "build.txt")
|
||||||
if (file.exists()) file.readText().trim() else "unknown"
|
if (file.exists()) file.readText().trim() else "unknown"
|
||||||
|
|||||||
@@ -32,19 +32,17 @@ import com.intellij.openapi.ui.Messages
|
|||||||
import com.intellij.openapi.vfs.JarFileSystem
|
import com.intellij.openapi.vfs.JarFileSystem
|
||||||
import com.intellij.openapi.vfs.VfsUtil
|
import com.intellij.openapi.vfs.VfsUtil
|
||||||
import com.intellij.openapi.vfs.VirtualFile
|
import com.intellij.openapi.vfs.VirtualFile
|
||||||
import com.intellij.psi.JavaPsiFacade
|
|
||||||
import com.intellij.psi.PsiClass
|
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
import com.intellij.util.containers.MultiMap
|
import com.intellij.util.containers.MultiMap
|
||||||
import com.intellij.util.indexing.FileBasedIndex
|
import com.intellij.util.indexing.FileBasedIndex
|
||||||
import com.intellij.util.indexing.ScalarIndexExtension
|
import com.intellij.util.indexing.ScalarIndexExtension
|
||||||
import com.intellij.util.text.VersionComparatorUtil
|
import com.intellij.util.text.VersionComparatorUtil
|
||||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
|
||||||
import org.jetbrains.kotlin.config.JvmTarget
|
import org.jetbrains.kotlin.config.JvmTarget
|
||||||
import org.jetbrains.kotlin.config.KotlinCompilerVersion
|
import org.jetbrains.kotlin.config.KotlinCompilerVersion
|
||||||
import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil
|
import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil
|
||||||
import org.jetbrains.kotlin.idea.framework.isExternalLibrary
|
import org.jetbrains.kotlin.idea.framework.isExternalLibrary
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
|
import org.jetbrains.kotlin.idea.util.isSnapshot
|
||||||
import org.jetbrains.kotlin.idea.util.projectStructure.version
|
import org.jetbrains.kotlin.idea.util.projectStructure.version
|
||||||
import org.jetbrains.kotlin.idea.util.runWithAlternativeResolveEnabled
|
import org.jetbrains.kotlin.idea.util.runWithAlternativeResolveEnabled
|
||||||
import org.jetbrains.kotlin.idea.vfilefinder.KotlinJavaScriptMetaFileIndex
|
import org.jetbrains.kotlin.idea.vfilefinder.KotlinJavaScriptMetaFileIndex
|
||||||
@@ -235,10 +233,6 @@ fun getDefaultJvmTarget(sdk: Sdk?, version: String): JvmTarget? {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isSnapshot(version: String): Boolean {
|
|
||||||
return version.contains("SNAPSHOT", ignoreCase = true)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun hasJdkLikeUpdatedRuntime(version: String): Boolean =
|
fun hasJdkLikeUpdatedRuntime(version: String): Boolean =
|
||||||
VersionComparatorUtil.compare(version, "1.2.0-rc-39") >= 0 ||
|
VersionComparatorUtil.compare(version, "1.2.0-rc-39") >= 0 ||
|
||||||
isSnapshot(version) ||
|
isSnapshot(version) ||
|
||||||
|
|||||||
Reference in New Issue
Block a user