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

Introduce skeleton for ChangeGeneralLanguageFeatureSupportFix

Browse Source 
Part of KT-26775 and KT-26774
This commit is contained in:
Mikhail Glukhikh
2018-09-18 15:47:08 +03:00
parent fd3dfe0710
commit b194be7665
10 changed files with 218 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
+20 -15
View File
@@ -62,25 +62,30 @@ fun getLibraryLanguageLevel(
}
fun getDefaultLanguageLevel(
module: Module,
explicitVersion: String? = null,
coerceRuntimeLibraryVersionToReleased: Boolean = true
module: Module,
explicitVersion: String? = null,
coerceRuntimeLibraryVersionToReleased: Boolean = true
): LanguageVersion {
val libVersion = explicitVersion
?: KotlinVersionInfoProvider.EP_NAME.extensions
.mapNotNull { it.getCompilerVersion(module) }
.addReleaseVersionIfNecessary(coerceRuntimeLibraryVersionToReleased)
.minWith(VersionComparatorUtil.COMPARATOR)
?: return VersionView.RELEASED_VERSION
return when {
libVersion.startsWith("1.3") -> LanguageVersion.KOTLIN_1_3
libVersion.startsWith("1.2") -> LanguageVersion.KOTLIN_1_2
libVersion.startsWith("1.1") -> LanguageVersion.KOTLIN_1_1
libVersion.startsWith("1.0") -> LanguageVersion.KOTLIN_1_0
else -> VersionView.RELEASED_VERSION
}
?: KotlinVersionInfoProvider.EP_NAME.extensions
.mapNotNull { it.getCompilerVersion(module) }
.addReleaseVersionIfNecessary(coerceRuntimeLibraryVersionToReleased)
.minWith(VersionComparatorUtil.COMPARATOR)
?: return VersionView.RELEASED_VERSION
return libVersion.toLanguageVersion()
}
fun String?.toLanguageVersion(): LanguageVersion = when {
this == null -> VersionView.RELEASED_VERSION
startsWith("1.3") -> LanguageVersion.KOTLIN_1_3
startsWith("1.2") -> LanguageVersion.KOTLIN_1_2
startsWith("1.1") -> LanguageVersion.KOTLIN_1_1
startsWith("1.0") -> LanguageVersion.KOTLIN_1_0
else -> VersionView.RELEASED_VERSION
}
fun String?.toApiVersion(): ApiVersion = ApiVersion.createByLanguageVersion(toLanguageVersion())
private fun Iterable<String>.addReleaseVersionIfNecessary(shouldAdd: Boolean): Iterable<String> =
if (shouldAdd) this + VersionView.RELEASED_VERSION.versionString else this