From 94df78aea0abe7d3bdcf1997f6e5f12f8c063334 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 12 Mar 2020 20:39:45 +0700 Subject: [PATCH] K/N in IDE: Drop support of "konan.native" package --- .../kotlin/ide/konan/KotlinNativeModuleConfigurator.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeModuleConfigurator.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeModuleConfigurator.kt index 904b3b73956..2e521c44334 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeModuleConfigurator.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativeModuleConfigurator.kt @@ -20,11 +20,8 @@ fun hasKotlinNativeRuntimeInScope(module: Module): Boolean = module.project.runR hasKotlinNativeMetadataFile(module.project, LibraryKindSearchScope(module, scope, NativeLibraryKind)) } -private val KOTLIN_NATIVE_FQ_NAMES = listOf( - "kotlin.native", - "konan.native" // Keep "konan.native" for backward compatibility with older versions of Kotlin/Native. -).map { FqName(it) } +private val KOTLIN_NATIVE_FQ_NAME = FqName("kotlin.native") fun hasKotlinNativeMetadataFile(project: Project, scope: GlobalSearchScope): Boolean = project.runReadActionInSmartMode { - KOTLIN_NATIVE_FQ_NAMES.any { KotlinNativeMetaFileIndex.hasSomethingInPackage(it, scope) } + KotlinNativeMetaFileIndex.hasSomethingInPackage(KOTLIN_NATIVE_FQ_NAME, scope) }