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

Remove unsupported versions from kotlin compiler tab in settings

Browse Source 
KT-36146 In progress
This commit is contained in:
Pavel Kirpichenkov
2020-01-29 15:07:35 +03:00
parent 913ed71863
commit 9902643a26
8 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
+1 -1
View File
@@ -585,7 +585,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
if (value == null) null
else LanguageVersion.fromVersionString(value)
?: run {
val versionStrings = LanguageVersion.values().map(LanguageVersion::description)
val versionStrings = LanguageVersion.values().filterNot(LanguageVersion::isUnsupported).map(LanguageVersion::description)
val message = "Unknown $versionOf version: $value\nSupported $versionOf versions: ${versionStrings.joinToString(", ")}"
collector.report(CompilerMessageSeverity.ERROR, message, null)
null
compiler/testData/cli/jvm/apiVersionInvalid.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown API version: 239.42
Supported API versions: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 (EXPERIMENTAL)
Supported API versions: 1.2 (DEPRECATED), 1.3, 1.4, 1.5 (EXPERIMENTAL)
COMPILATION_ERROR
compiler/testData/cli/jvm/languageVersionInvalid.out
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
error: unknown language version: 239.42
Supported language versions: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 (EXPERIMENTAL)
Supported language versions: 1.2 (DEPRECATED), 1.3, 1.4, 1.5 (EXPERIMENTAL)
COMPILATION_ERROR
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+7 -2
View File
@@ -249,7 +249,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware {
get() = this <= LATEST_STABLE
val isDeprecated: Boolean
get() = this >= OLDEST_DEPRECATED && this < FIRST_SUPPORTED
get() = OLDEST_DEPRECATED <= this && this < FIRST_SUPPORTED
val isUnsupported: Boolean
get() = this < OLDEST_DEPRECATED
@@ -258,7 +258,12 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware {
get() = "$major.$minor"
override val description: String
get() = if (isStable) versionString else "$versionString (EXPERIMENTAL)"
get() = when {
!isStable -> "$versionString (EXPERIMENTAL)"
isDeprecated -> "$versionString (DEPRECATED)"
isUnsupported -> "$versionString (UNSUPPORTED)"
else -> versionString
}
override fun toString() = versionString