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

Minor, use elvis in deprecationUtil.kt

Browse Source
This commit is contained in:
Alexander Udalov
2018-03-05 13:43:10 +01:00
parent e92e7c6f80
commit f41165c566
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+13 -14
View File
@@ -337,20 +337,19 @@ class DeprecationResolver(
val versionRequirement = val versionRequirement =
(target as? DeserializedMemberDescriptor)?.versionRequirement (target as? DeserializedMemberDescriptor)?.versionRequirement
?: (target as? DeserializedClassDescriptor)?.versionRequirement ?: (target as? DeserializedClassDescriptor)?.versionRequirement
if (versionRequirement != null) { ?: return null
val requiredVersion = createVersion(versionRequirement.version.asString()) val requiredVersion = createVersion(versionRequirement.version.asString())
val currentVersion = when (versionRequirement.kind) { val currentVersion = when (versionRequirement.kind) {
ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION -> ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION ->
MavenComparableVersion(languageVersionSettings.languageVersion.versionString) MavenComparableVersion(languageVersionSettings.languageVersion.versionString)
ProtoBuf.VersionRequirement.VersionKind.API_VERSION -> ProtoBuf.VersionRequirement.VersionKind.API_VERSION ->
languageVersionSettings.apiVersion.version languageVersionSettings.apiVersion.version
ProtoBuf.VersionRequirement.VersionKind.COMPILER_VERSION -> ProtoBuf.VersionRequirement.VersionKind.COMPILER_VERSION ->
KotlinCompilerVersion.getVersion()?.takeIf { "SNAPSHOT" !in it }?.let(::createVersion) KotlinCompilerVersion.getVersion()?.takeIf { "SNAPSHOT" !in it }?.let(::createVersion)
else -> null else -> null
} }
if (currentVersion != null && currentVersion < requiredVersion) { if (currentVersion != null && currentVersion < requiredVersion) {
return DeprecatedByVersionRequirement(versionRequirement, target) return DeprecatedByVersionRequirement(versionRequirement, target)
}
} }
return null return null
} }