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

IDE perf tests for K/N: Drop redundant check for CommonLibraryKind

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-03-23 16:47:42 +07:00
parent b0e916769d
commit 03cd229784
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceNativeProjectsTest.kt
+1 -9
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.idea.caches.project.isMPPModule
import org.jetbrains.kotlin.idea.configuration.klib.KotlinNativeLibraryNameUtil.parseIDELibraryName import org.jetbrains.kotlin.idea.configuration.klib.KotlinNativeLibraryNameUtil.parseIDELibraryName
import org.jetbrains.kotlin.idea.configuration.readGradleProperty import org.jetbrains.kotlin.idea.configuration.readGradleProperty
import org.jetbrains.kotlin.idea.facet.KotlinFacet import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
import org.jetbrains.kotlin.idea.framework.detectLibraryKind import org.jetbrains.kotlin.idea.framework.detectLibraryKind
import org.jetbrains.kotlin.idea.perf.PerformanceNativeProjectsTest.TestProject.* import org.jetbrains.kotlin.idea.perf.PerformanceNativeProjectsTest.TestProject.*
import org.jetbrains.kotlin.idea.perf.PerformanceNativeProjectsTest.TestTarget.* import org.jetbrains.kotlin.idea.perf.PerformanceNativeProjectsTest.TestTarget.*
@@ -315,14 +314,7 @@ class PerformanceNativeProjectsTest : AbstractPerformanceProjectsTest() {
.asSequence() .asSequence()
.filterIsInstance<LibraryOrderEntry>() .filterIsInstance<LibraryOrderEntry>()
.mapNotNull { it.library } .mapNotNull { it.library }
.filter { library -> .filter { detectLibraryKind(it.getFiles(OrderRootType.CLASSES)) == NativeLibraryKind }
val libraryKind = detectLibraryKind(library.getFiles(OrderRootType.CLASSES))
libraryKind == NativeLibraryKind
// TODO: remove this check for CommonLibraryKind when detection of K/N KLIBs in
// org.jetbrains.kotlin.ide.konan.KotlinNativePluginUtilKt.isKonanLibraryRoot
// is correctly implemented
|| libraryKind == CommonLibraryKind
}
.mapNotNull inner@{ library -> .mapNotNull inner@{ library ->
val libraryNameParts = parseIDELibraryName(library.name.orEmpty()) ?: return@inner null val libraryNameParts = parseIDELibraryName(library.name.orEmpty()) ?: return@inner null
val (_, pureLibraryName, platformPart) = libraryNameParts val (_, pureLibraryName, platformPart) = libraryNameParts