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

Detect K/N library kind if library is a ZIP file (common part)

Browse Source 
Issue #KT-26730
This commit is contained in:
Dmitriy Dolovov
2018-09-11 10:48:19 +03:00
parent 8a79255176
commit 0d0929922a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
+7 -4
View File
@@ -68,10 +68,13 @@ fun getLibraryPlatform(project: Project, library: Library): TargetPlatform {
fun detectLibraryKind(roots: Array<VirtualFile>): PersistentLibraryKind<*>? { fun detectLibraryKind(roots: Array<VirtualFile>): PersistentLibraryKind<*>? {
val jarFile = roots.firstOrNull() ?: return null val jarFile = roots.firstOrNull() ?: return null
if (jarFile.fileSystem is JarFileSystem) { if (jarFile.fileSystem is JarFileSystem) {
return when (jarFile.getLibraryKindForJar()) { // TODO: Detect library kind for Jar file using IdePlatformKindResolution.
KnownLibraryKindForIndex.COMMON -> CommonLibraryKind when (jarFile.getLibraryKindForJar()) {
KnownLibraryKindForIndex.JS -> JSLibraryKind KnownLibraryKindForIndex.COMMON -> return CommonLibraryKind
KnownLibraryKindForIndex.UNKNOWN -> null KnownLibraryKindForIndex.JS -> return JSLibraryKind
KnownLibraryKindForIndex.UNKNOWN -> {
/* Continue detection of library kind via IdePlatformKindResolution. */
}
} }
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
+1
View File
@@ -25,6 +25,7 @@ private val KOTLIN_LIBRARY_KIND_FILE_ATTRIBUTE: String = "kotlin-library-kind".a
ServiceManager.getService(FileAttributeService::class.java)?.register(this, 1) ServiceManager.getService(FileAttributeService::class.java)?.register(this, 1)
} }
// TODO: Detect library kind for Jar file using IdePlatformKindResolution.
fun VirtualFile.getLibraryKindForJar(): KnownLibraryKindForIndex { fun VirtualFile.getLibraryKindForJar(): KnownLibraryKindForIndex {
if (this !is VirtualFileWithId) return detectLibraryKindFromJarContentsForIndex(this) if (this !is VirtualFileWithId) return detectLibraryKindFromJarContentsForIndex(this)