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

Support "// !API_VERSION: LATEST" directive in tests

Browse Source 
Useful for tests that check behavior which depends on having a recent
API version enabled, and that don't want to depend on a specific fixed
API version (to prevent eventual obsoletion)
This commit is contained in:
Alexander Udalov
2019-08-07 12:06:45 +02:00
parent 13b07e71e8
commit 570d66be46
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt
+5 -2
View File
@@ -76,8 +76,11 @@ fun parseLanguageVersionSettings(directives: Map<String, String>): CompilerTestL
return null return null
} }
val apiVersion = (if (apiVersionString != null) ApiVersion.parse(apiVersionString) else ApiVersion.LATEST_STABLE) val apiVersion = when (apiVersionString) {
?: error("Unknown API version: $apiVersionString") null -> ApiVersion.LATEST_STABLE
"LATEST" -> ApiVersion.LATEST
else -> ApiVersion.parse(apiVersionString) ?: error("Unknown API version: $apiVersionString")
}
val languageVersion = maxOf(LanguageVersion.LATEST_STABLE, LanguageVersion.fromVersionString(apiVersion.versionString)!!) val languageVersion = maxOf(LanguageVersion.LATEST_STABLE, LanguageVersion.fromVersionString(apiVersion.versionString)!!)
compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+3
View File
@@ -52,6 +52,9 @@ class ApiVersion private constructor(
@JvmField @JvmField
val KOTLIN_1_3 = createByLanguageVersion(LanguageVersion.KOTLIN_1_3) val KOTLIN_1_3 = createByLanguageVersion(LanguageVersion.KOTLIN_1_3)
@JvmField
val LATEST: ApiVersion = createByLanguageVersion(LanguageVersion.values().last())
@JvmField @JvmField
val LATEST_STABLE: ApiVersion = createByLanguageVersion(LanguageVersion.LATEST_STABLE) val LATEST_STABLE: ApiVersion = createByLanguageVersion(LanguageVersion.LATEST_STABLE)