diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
index 1662d1955d4..2f3827f86e8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/LibraryKinds.kt
@@ -68,10 +68,13 @@ fun getLibraryPlatform(project: Project, library: Library): TargetPlatform {
 fun detectLibraryKind(roots: Array<VirtualFile>): PersistentLibraryKind<*>? {
     val jarFile = roots.firstOrNull() ?: return null
     if (jarFile.fileSystem is JarFileSystem) {
-        return when (jarFile.getLibraryKindForJar()) {
-            KnownLibraryKindForIndex.COMMON -> CommonLibraryKind
-            KnownLibraryKindForIndex.JS -> JSLibraryKind
-            KnownLibraryKindForIndex.UNKNOWN -> null
+        // TODO: Detect library kind for Jar file using IdePlatformKindResolution.
+        when (jarFile.getLibraryKindForJar()) {
+            KnownLibraryKindForIndex.COMMON -> return CommonLibraryKind
+            KnownLibraryKindForIndex.JS -> return JSLibraryKind
+            KnownLibraryKindForIndex.UNKNOWN -> {
+                /* Continue detection of library kind via IdePlatformKindResolution. */
+            }
         }
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
index 6d0d8821ddd..09e7f81126a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
@@ -25,6 +25,7 @@ private val KOTLIN_LIBRARY_KIND_FILE_ATTRIBUTE: String = "kotlin-library-kind".a
     ServiceManager.getService(FileAttributeService::class.java)?.register(this, 1)
 }
 
+// TODO: Detect library kind for Jar file using IdePlatformKindResolution.
 fun VirtualFile.getLibraryKindForJar(): KnownLibraryKindForIndex {
     if (this !is VirtualFileWithId) return detectLibraryKindFromJarContentsForIndex(this)