From 132464fa4fa51c96edc033c427a0dba24f6b0ec5 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 31 Mar 2020 19:09:29 +0700 Subject: [PATCH] Minor. Rename KotlinLibrary.readSafe() -> KotlinLibrary.safeRead() --- .../org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt | 4 ++-- .../idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt | 2 +- .../kotlin/ide/konan/NativePlatformKindResolution.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt index 0a74b40ef5b..a513c2fdc1a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/KlibCompatibilityInfo.kt @@ -20,11 +20,11 @@ sealed class KlibCompatibilityInfo(val isCompatible: Boolean) { } fun KotlinLibrary.getCompatibilityInfo(): KlibCompatibilityInfo { - val hasPre14Manifest = readSafe(false) { has_pre_1_4_manifest } + val hasPre14Manifest = safeRead(false) { has_pre_1_4_manifest } if (hasPre14Manifest) return Pre14Layout - val metadataVersion = readSafe(null) { metadataVersion } + val metadataVersion = safeRead(null) { metadataVersion } return when { metadataVersion == null -> IncompatibleMetadata(true) // too old KLIB format, even doesn't have metadata version !metadataVersion.isCompatible() -> IncompatibleMetadata(!metadataVersion.isAtLeast(KlibMetadataVersion.INSTANCE)) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt index 8750b11bab4..fa9351d1cf8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/utils.kt @@ -85,7 +85,7 @@ private val VirtualFile.isLegacyNativeKlibComponent: Boolean } -fun KotlinLibrary.readSafe(defaultValue: T, action: KotlinLibrary.() -> T) = try { +fun KotlinLibrary.safeRead(defaultValue: T, action: KotlinLibrary.() -> T) = try { action() } catch (_: IOException) { defaultValue diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt index 6c65e547fea..736097cde4f 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt @@ -163,7 +163,7 @@ class NativeKlibLibraryInfo(project: Project, library: Library, libraryRoot: Str get() { val capabilities = super.capabilities.toMutableMap() 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 }