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

[K/N in IDE] Display short names of platform libs

Browse Source
This commit is contained in:
Ilya Matveev
2020-03-24 17:05:56 +07:00
parent 343e8c6f84
commit 7c0ab5a58e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProvider.kt
+6 -1
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.target.TargetSupportException
import org.jetbrains.kotlin.library.KLIB_MANIFEST_FILE_NAME
import org.jetbrains.kotlin.library.KLIB_PROPERTY_SHORT_NAME
import org.jetbrains.kotlin.library.KLIB_PROPERTY_UNIQUE_NAME
import java.io.File
import java.io.IOException
@@ -57,7 +58,11 @@ class KlibInfoProvider(kotlinNativeHome: File) {
val manifestFile = findManifestFile(libraryPath) ?: return null
val manifest = loadProperties(manifestFile)
val name = manifest.getProperty(KLIB_PROPERTY_UNIQUE_NAME) ?: return null
val name = with(manifest) {
getProperty(KLIB_PROPERTY_SHORT_NAME)
?: getProperty(KLIB_PROPERTY_UNIQUE_NAME)
?: return null
}
val target = (detectTarget(libraryPath) ?: return null).result
return when (origin) {