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

Minor. Rename KotlinLibrary.readSafe() -> KotlinLibrary.safeRead()

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-03-31 19:09:29 +07:00
parent b199403c57
commit 132464fa4f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt
+2 -2
View File
@@ -20,11 +20,11 @@ sealed class KlibCompatibilityInfo(val isCompatible: Boolean) {
} }
fun KotlinLibrary.getCompatibilityInfo(): KlibCompatibilityInfo { fun KotlinLibrary.getCompatibilityInfo(): KlibCompatibilityInfo {
val hasPre14Manifest = readSafe(false) { has_pre_1_4_manifest } val hasPre14Manifest = safeRead(false) { has_pre_1_4_manifest }
if (hasPre14Manifest) if (hasPre14Manifest)
return Pre14Layout return Pre14Layout
val metadataVersion = readSafe(null) { metadataVersion } val metadataVersion = safeRead(null) { metadataVersion }
return when { return when {
metadataVersion == null -> IncompatibleMetadata(true) // too old KLIB format, even doesn't have metadata version metadataVersion == null -> IncompatibleMetadata(true) // too old KLIB format, even doesn't have metadata version
!metadataVersion.isCompatible() -> IncompatibleMetadata(!metadataVersion.isAtLeast(KlibMetadataVersion.INSTANCE)) !metadataVersion.isCompatible() -> IncompatibleMetadata(!metadataVersion.isAtLeast(KlibMetadataVersion.INSTANCE))
idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt
+1 -1
View File
@@ -85,7 +85,7 @@ private val VirtualFile.isLegacyNativeKlibComponent: Boolean
} }
fun <T> KotlinLibrary.readSafe(defaultValue: T, action: KotlinLibrary.() -> T) = try { fun <T> KotlinLibrary.safeRead(defaultValue: T, action: KotlinLibrary.() -> T) = try {
action() action()
} catch (_: IOException) { } catch (_: IOException) {
defaultValue defaultValue
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+1 -1
View File
@@ -163,7 +163,7 @@ class NativeKlibLibraryInfo(project: Project, library: Library, libraryRoot: Str
get() { get() {
val capabilities = super.capabilities.toMutableMap() val capabilities = super.capabilities.toMutableMap()
capabilities += KlibModuleOrigin.CAPABILITY to DeserializedKlibModuleOrigin(resolvedKotlinLibrary) capabilities += KlibModuleOrigin.CAPABILITY to DeserializedKlibModuleOrigin(resolvedKotlinLibrary)
capabilities += ImplicitIntegerCoercion.MODULE_CAPABILITY to resolvedKotlinLibrary.readSafe(false) { isInterop } capabilities += ImplicitIntegerCoercion.MODULE_CAPABILITY to resolvedKotlinLibrary.safeRead(false) { isInterop }
return capabilities return capabilities
} }