diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt index c545a78790dc..4045a420420b 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt @@ -82,8 +82,9 @@ class CompiledFilesHighlightingTest: KotlinLightCodeInsightFixtureTestCase() { expectedDuplicatedHighlighting: Boolean = false, openFileAction: (VirtualFile) -> VirtualFile = { it } ) { + val libraryExtension = libraryFile.extension val libraryVirtualFile = - if (libraryFile.extension == "jar") { + if (libraryExtension == "jar" || libraryExtension == "klib") { StandardFileSystems.jar().findFileByPath(libraryFile.absolutePath + URLUtil.JAR_SEPARATOR) } else { VirtualFileManager.getInstance().findFileByNioPath(libraryFile.toPath()) diff --git a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt index 14b14ed5890a..27d281914242 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt @@ -145,4 +145,4 @@ Navigation item file #0: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.c UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt index 3ecf1e0643aa..98a127f4fff4 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt @@ -147,4 +147,4 @@ Navigation item file #1: kotlin-stdlib-sources.jar!/commonMain/kotlin/annotation UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt index 95aee2728724..63789112042e 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt @@ -217,4 +217,4 @@ Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt__ArraysJ UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt index 0db0c5e5dabc..bfe491e9a5cd 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt @@ -215,4 +215,4 @@ Navigation item file #0: kotlin-stdlib-sources.jar!/jvmMain/kotlin/collections/A UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt index 1e40bb4c3a72..fbb83a3bb02a 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt @@ -217,4 +217,4 @@ Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt index 1e40bb4c3a72..fbb83a3bb02a 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt @@ -217,4 +217,4 @@ Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt b/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt index 2df78f3a3e59..a94cc0ecae5c 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt @@ -217,4 +217,4 @@ Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___Arrays UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt index 1e47a126e6a6..623447d0a09e 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt @@ -215,4 +215,4 @@ Navigation item file #0: kotlin-stdlib-sources.jar!/commonMain/generated/_Arrays UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt index 8cc1b6ecefee..714bdea52651 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt @@ -1996,4 +1996,4 @@ Navigation item file #0: kotlin-stdlib-sources.jar!/commonMain/generated/_Arrays UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt index 2c892b5d19dc..327a5bf9e856 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt @@ -217,4 +217,4 @@ Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___Arrays UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib diff --git a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt index 142a6ade4c5f..7639de04e570 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt @@ -215,4 +215,4 @@ Navigation item file #0: kotlin-stdlib-sources.jar!/jvmMain/generated/_ArraysJvm UShortArrayKt UShortKt +PsiDirectory: META-INF - +PsiDirectory: kotlin-stdlib-common.jar + +PsiDirectory: kotlin-stdlib-common.klib