azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CHERRY PICKED FROM IJ] [cleanup] Inline VersionView.RELEASED_VERSION

Browse Source 
The variable is redundant

GitOrigin-RevId: 99e0e06f8eda6410c41a67b88db50d4d8b5f52ca
Original commit: https://github.com/JetBrains/intellij-community/commit/8b09416812def39f15cdcd7e836129ca6ccc2094
This commit is contained in:
Nikita Bobko
2021-11-01 15:20:08 +01:00
parent fd843ad4be
commit b252897a01
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+1 -3
View File
@@ -51,7 +51,7 @@ sealed class VersionView : DescriptionAware {
abstract val version: LanguageVersion abstract val version: LanguageVersion
object LatestStable : VersionView() { object LatestStable : VersionView() {
override val version: LanguageVersion = RELEASED_VERSION override val version: LanguageVersion = LanguageVersion.LATEST_STABLE
override val description: String override val description: String
get() = "Latest stable (${version.versionString})" get() = "Latest stable (${version.versionString})"
@@ -67,8 +67,6 @@ sealed class VersionView : DescriptionAware {
} }
companion object { companion object {
val RELEASED_VERSION = LanguageVersion.LATEST_STABLE
fun deserialize(value: String?, isAutoAdvance: Boolean): VersionView { fun deserialize(value: String?, isAutoAdvance: Boolean): VersionView {
if (isAutoAdvance) return LatestStable if (isAutoAdvance) return LatestStable
val languageVersion = LanguageVersion.fromVersionString(value) val languageVersion = LanguageVersion.fromVersionString(value)
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta
val haveSameCompiler = targets.all { it.javaClass == representativeTarget.javaClass } val haveSameCompiler = targets.all { it.javaClass == representativeTarget.javaClass }
private val defaultLanguageVersion = VersionView.RELEASED_VERSION private val defaultLanguageVersion = LanguageVersion.LATEST_STABLE
val compilerArguments by lazy { val compilerArguments by lazy {
representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also { representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also {