From f7f7d237e0372df089681f983aecd4dc5762f5f1 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Fri, 3 Apr 2020 19:29:32 +0700
Subject: [PATCH] [KLIB] Support unpacked klibs with dots in names in
 ToolingResolve

---
 .../jetbrains/kotlin/library/ToolingResolve.kt   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/ToolingResolve.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/ToolingResolve.kt
index 9bf6007c1aa..b5d4b8fe594 100644
--- a/compiler/util-klib/src/org/jetbrains/kotlin/library/ToolingResolve.kt
+++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/ToolingResolve.kt
@@ -59,19 +59,13 @@ object ToolingSingleFileKlibResolveStrategy : SingleFileKlibResolveStrategy {
         val extension = libraryFile.extension
 
         val wrappedAction: () -> T? = when {
-            extension == KLIB_FILE_EXTENSION -> {
-                if (!libraryFile.isFile) return null
-
-                { libraryFile.withZipFileSystem { fs -> action(fs.file("/")) } }
-            }
-
-            extension.isNotEmpty() -> return null
-
-            else -> {
-                if (!libraryFile.isDirectory) return null
-
+            libraryFile.isDirectory -> {
                 { action(libraryFile) }
             }
+            libraryFile.isFile && extension == KLIB_FILE_EXTENSION -> {
+                { libraryFile.withZipFileSystem { fs -> action(fs.file("/")) } }
+            }
+            else -> return null
         }
 
         return try {