From b123992da237c9d20791483a81f7456de405d97b Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Sat, 14 Jan 2023 14:33:28 +0100 Subject: [PATCH] [kotlin][tests] AbstractKotlinProjectViewTest: add file path to output GitOrigin-RevId: 9c4e20b0938db0fb5cbc3613164e36dc5a6369f8 --- .../AbstractKotlinProjectViewTest.kt | 36 ++++++++++++++----- .../projectView/AnnotationFromStdlib.txt | 4 +-- .../AnnotationFromStdlibWithSources.txt | 6 ++-- .../tests/testData/projectView/ArraysJVM.txt | 6 ++-- .../projectView/ArraysJVMWithSources.txt | 4 +-- .../tests/testData/projectView/ArraysKt.txt | 6 ++-- .../projectView/ArraysKtWithSources.txt | 6 ++-- .../testData/projectView/ClassFromMyLib.txt | 4 +-- .../projectView/ClassFromMyLibWithSources.txt | 6 ++-- .../MultifileFacadeInternalClass.txt | 6 ++-- ...ultifileFacadeInternalClassWithSources.txt | 4 +-- .../projectView/MultifileFacadeKt.txt | 6 ++-- .../MultifileFacadeKtWithSources.txt | 6 ++-- .../OneFileMultifileFacadeInternalClass.txt | 6 ++-- ...ultifileFacadeInternalClassWithSources.txt | 4 +-- .../projectView/OneFileMultifileFacadeKt.txt | 6 ++-- ...ileMultifileFacadeKtWithSeveralJvmName.txt | 6 ++-- ...eFacadeKtWithSeveralJvmNameWithSources.txt | 4 +-- .../OneFileMultifileFacadeKtWithSources.txt | 4 +-- .../testData/projectView/ScriptMembers.txt | 6 ++-- .../tests/testData/projectView/_Arrays.txt | 6 ++-- .../projectView/_ArraysWithSources.txt | 4 +-- .../testData/projectView/___ArraysJvm.txt | 6 ++-- .../projectView/___ArraysJvmWithSources.txt | 4 +-- 24 files changed, 87 insertions(+), 69 deletions(-) diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt index 26a855465a46..a48070ca1c09 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt @@ -2,6 +2,7 @@ package org.jetbrains.kotlin.idea.projectView import com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode +import com.intellij.openapi.vfs.JarFileSystem import com.intellij.openapi.vfs.VirtualFile import com.intellij.projectView.TestProjectTreeStructure import com.intellij.psi.PsiElement @@ -16,8 +17,7 @@ import org.jetbrains.kotlin.idea.test.Directives import org.jetbrains.kotlin.idea.test.KotlinMultiFileHeavyProjectTestCase import java.io.File import javax.swing.tree.DefaultMutableTreeNode -import kotlin.io.path.Path -import kotlin.io.path.name +import kotlin.io.path.* abstract class AbstractKotlinProjectViewTest : KotlinMultiFileHeavyProjectTestCase() { private lateinit var treeStructure: TestProjectTreeStructure @@ -59,15 +59,32 @@ abstract class AbstractKotlinProjectViewTest : KotlinMultiFileHeavyProjectTestCa assertEqualsToFile( description = "The tree is different", expected = File(testDataPath.substringBeforeLast('.') + ".txt"), - actual = "Node: $node\n" + - "User object class: ${psiBasedNode?.let { it::class.simpleName }}\n\n" + - "Value: ${psiBasedNode?.value}\n" + - "Value file: ${(psiBasedNode?.value as? PsiElement)?.containingFile?.name}\n\n" + - deepNavigation(navigationItem) + "\n\n" + - sanitizeTree(actualTree), + actual = sanitizeTree( + "Node: $node\n" + + "User object class: ${psiBasedNode?.let { it::class.simpleName }}\n\n" + + "Value: ${psiBasedNode?.value}\n" + + "Value file: ${filePath(psiBasedNode?.value)}\n\n" + + deepNavigation(navigationItem) + "\n\n" + + actualTree + ) ) } + private fun filePath(element: Any?): String? { + if (element !is PsiElement) return null + + val virtualFile = element.containingFile.virtualFile + val fileSystem = virtualFile.fileSystem + val prefixFile = if (fileSystem is JarFileSystem) { + fileSystem.getVirtualFileForJar(virtualFile)?.path?.let(::Path)?.parent!! + } else { + module.moduleNioFile.parent.listDirectoryEntries().single() + } + + val path = Path(virtualFile.path) + return path.relativeTo(prefixFile).pathString + } + private fun deepNavigation(element: Any?): String { if (element == null) return "Navigation item not found" return buildString { @@ -77,7 +94,8 @@ abstract class AbstractKotlinProjectViewTest : KotlinMultiFileHeavyProjectTestCa private fun StringBuilder.deepNavigation(element: Any, count: Int) { appendLine("Navigation item #${count}: $element") - appendLine("Navigation item file #${count}: ${(element as? PsiElement)?.containingFile?.name}") + appendLine("Navigation item file #${count}: ${filePath(element)}") + if (element !is PsiElement) return val navigateElement = element.navigationElement if (navigateElement == element) return diff --git a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt index ac76531369b2..cd4d6eee1475 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlib.txt @@ -2,10 +2,10 @@ Node: AnnotationTarget User object class: KtClassOrObjectTreeNode Value: CLASS -Value file: AnnotationTarget.class +Value file: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.class Navigation item #0: CLASS -Navigation item file #0: AnnotationTarget.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt index 433413f48a24..796a5f40ddd0 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt @@ -2,12 +2,12 @@ Node: AnnotationTarget User object class: KtClassOrObjectTreeNode Value: CLASS -Value file: AnnotationTarget.class +Value file: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.class Navigation item #0: CLASS -Navigation item file #0: AnnotationTarget.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.class Navigation item #1: CLASS -Navigation item file #1: Annotations.kt +Navigation item file #1: kotlin-stdlib-sources.jar!/kotlin/annotation/Annotations.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt index d569486dab41..1bc8cb1777f7 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVM.txt @@ -2,12 +2,12 @@ Node: ArraysKt__ArraysJVMKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt__ArraysJVMKt.class -Value file: ArraysKt__ArraysJVMKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt__ArraysJVMKt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt__ArraysJVMKt.class -Navigation item file #0: ArraysKt__ArraysJVMKt.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/collections/ArraysKt__ArraysJVMKt.class Navigation item #1: KtFile: ArraysKt__ArraysJVMKt.class -Navigation item file #1: ArraysKt__ArraysJVMKt.class +Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt__ArraysJVMKt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt index c0bfda7abf72..3ce69eeb3712 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysJVMWithSources.txt @@ -2,10 +2,10 @@ Node: ArraysKt__ArraysJVMKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt__ArraysJVMKt.class -Value file: ArraysKt__ArraysJVMKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt__ArraysJVMKt.class Navigation item #0: KtFile: ArraysJVM.kt -Navigation item file #0: ArraysJVM.kt +Navigation item file #0: kotlin-stdlib-sources.jar!/kotlin/collections/ArraysJVM.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt index dc9db93b69ea..6e951db35b82 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysKt.txt @@ -2,12 +2,12 @@ Node: ArraysKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt.class -Value file: ArraysKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt.class -Navigation item file #0: ArraysKt.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class Navigation item #1: KtFile: ArraysKt.class -Navigation item file #1: ArraysKt.class +Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt index dc9db93b69ea..6e951db35b82 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ArraysKtWithSources.txt @@ -2,12 +2,12 @@ Node: ArraysKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt.class -Value file: ArraysKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt.class -Navigation item file #0: ArraysKt.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class Navigation item #1: KtFile: ArraysKt.class -Navigation item file #1: ArraysKt.class +Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLib.txt b/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLib.txt index d6ab4664c31a..366c152a30d9 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLib.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLib.txt @@ -2,10 +2,10 @@ Node: MyKotlinClass User object class: KtClassOrObjectTreeNode Value: CLASS -Value file: MyKotlinClass.class +Value file: kotlinMockLibrary.jar!/MyKotlinClass.class Navigation item #0: CLASS -Navigation item file #0: MyKotlinClass.class +Navigation item file #0: kotlinMockLibrary.jar!/MyKotlinClass.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLibWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLibWithSources.txt index c4dfdc44ebc2..9e3c9e21867a 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLibWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ClassFromMyLibWithSources.txt @@ -2,12 +2,12 @@ Node: MyKotlinClass User object class: KtClassOrObjectTreeNode Value: CLASS -Value file: MyKotlinClass.class +Value file: kotlinMockLibrary.jar!/MyKotlinClass.class Navigation item #0: CLASS -Navigation item file #0: MyKotlinClass.class +Navigation item file #0: kotlinMockLibrary.jar!/MyKotlinClass.class Navigation item #1: CLASS -Navigation item file #1: MyKotlinClass.kt +Navigation item file #1: lib/sources/MyKotlinClass.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClass.txt b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClass.txt index b29ead32337c..371bf0b5c5d7 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClass.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClass.txt @@ -2,12 +2,12 @@ Node: MyCustomFacade__Facade1Kt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade__Facade1Kt.class -Value file: MyCustomFacade__Facade1Kt.class +Value file: LibraryWithFacade.jar!/one/two/MyCustomFacade__Facade1Kt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade__Facade1Kt.class -Navigation item file #0: MyCustomFacade__Facade1Kt.class +Navigation item file #0: LibraryWithFacade.jar!/one/two/MyCustomFacade__Facade1Kt.class Navigation item #1: KtFile: MyCustomFacade__Facade1Kt.class -Navigation item file #1: MyCustomFacade__Facade1Kt.class +Navigation item file #1: LibraryWithFacade.jar!/one/two/MyCustomFacade__Facade1Kt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClassWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClassWithSources.txt index 9c057890caea..0b7a6fdaa53c 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClassWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeInternalClassWithSources.txt @@ -2,10 +2,10 @@ Node: MyCustomFacade__Facade1Kt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade__Facade1Kt.class -Value file: MyCustomFacade__Facade1Kt.class +Value file: LibraryWithFacade.jar!/one/two/MyCustomFacade__Facade1Kt.class Navigation item #0: KtFile: facade1.kt -Navigation item file #0: facade1.kt +Navigation item file #0: lib/sources/one/facade1.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKt.txt b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKt.txt index 0b1691b0579d..0e54b0567cec 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKt.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKt.txt @@ -2,12 +2,12 @@ Node: MyCustomFacade User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Value file: MyCustomFacade.class +Value file: LibraryWithFacade.jar!/one/two/MyCustomFacade.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Navigation item file #0: MyCustomFacade.class +Navigation item file #0: LibraryWithFacade.jar!/one/two/MyCustomFacade.class Navigation item #1: KtFile: MyCustomFacade.class -Navigation item file #1: MyCustomFacade.class +Navigation item file #1: LibraryWithFacade.jar!/one/two/MyCustomFacade.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKtWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKtWithSources.txt index 0b1691b0579d..0e54b0567cec 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKtWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/MultifileFacadeKtWithSources.txt @@ -2,12 +2,12 @@ Node: MyCustomFacade User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Value file: MyCustomFacade.class +Value file: LibraryWithFacade.jar!/one/two/MyCustomFacade.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Navigation item file #0: MyCustomFacade.class +Navigation item file #0: LibraryWithFacade.jar!/one/two/MyCustomFacade.class Navigation item #1: KtFile: MyCustomFacade.class -Navigation item file #1: MyCustomFacade.class +Navigation item file #1: LibraryWithFacade.jar!/one/two/MyCustomFacade.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClass.txt b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClass.txt index 7c4abab9dc85..0b686a1fca6b 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClass.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClass.txt @@ -2,12 +2,12 @@ Node: MyCustomFacade__FacadeKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade__FacadeKt.class -Value file: MyCustomFacade__FacadeKt.class +Value file: myLibraryWithFacade.jar!/MyCustomFacade__FacadeKt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade__FacadeKt.class -Navigation item file #0: MyCustomFacade__FacadeKt.class +Navigation item file #0: myLibraryWithFacade.jar!/MyCustomFacade__FacadeKt.class Navigation item #1: KtFile: MyCustomFacade__FacadeKt.class -Navigation item file #1: MyCustomFacade__FacadeKt.class +Navigation item file #1: myLibraryWithFacade.jar!/MyCustomFacade__FacadeKt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClassWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClassWithSources.txt index bc5f966dcae6..667ebe397db9 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClassWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeInternalClassWithSources.txt @@ -2,10 +2,10 @@ Node: MyCustomFacade__FacadeKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade__FacadeKt.class -Value file: MyCustomFacade__FacadeKt.class +Value file: myLibraryWithFacade.jar!/MyCustomFacade__FacadeKt.class Navigation item #0: KtFile: facade.kt -Navigation item file #0: facade.kt +Navigation item file #0: lib/sources/facade.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKt.txt b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKt.txt index c2e4df46d82f..02569e6d5a5b 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKt.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKt.txt @@ -2,12 +2,12 @@ Node: MyCustomFacade User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Value file: MyCustomFacade.class +Value file: myLibraryWithFacade.jar!/MyCustomFacade.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Navigation item file #0: MyCustomFacade.class +Navigation item file #0: myLibraryWithFacade.jar!/MyCustomFacade.class Navigation item #1: KtFile: MyCustomFacade.class -Navigation item file #1: MyCustomFacade.class +Navigation item file #1: myLibraryWithFacade.jar!/MyCustomFacade.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmName.txt b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmName.txt index c2e4df46d82f..02569e6d5a5b 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmName.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmName.txt @@ -2,12 +2,12 @@ Node: MyCustomFacade User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Value file: MyCustomFacade.class +Value file: myLibraryWithFacade.jar!/MyCustomFacade.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Navigation item file #0: MyCustomFacade.class +Navigation item file #0: myLibraryWithFacade.jar!/MyCustomFacade.class Navigation item #1: KtFile: MyCustomFacade.class -Navigation item file #1: MyCustomFacade.class +Navigation item file #1: myLibraryWithFacade.jar!/MyCustomFacade.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmNameWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmNameWithSources.txt index 215a34f45d88..eaaf6d994daf 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmNameWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSeveralJvmNameWithSources.txt @@ -2,10 +2,10 @@ Node: MyCustomFacade User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Value file: MyCustomFacade.class +Value file: myLibraryWithFacade.jar!/MyCustomFacade.class Navigation item #0: KtFile: facade.kt -Navigation item file #0: facade.kt +Navigation item file #0: lib/sources/facade.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSources.txt index 215a34f45d88..eaaf6d994daf 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/OneFileMultifileFacadeKtWithSources.txt @@ -2,10 +2,10 @@ Node: MyCustomFacade User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:MyCustomFacade.class -Value file: MyCustomFacade.class +Value file: myLibraryWithFacade.jar!/MyCustomFacade.class Navigation item #0: KtFile: facade.kt -Navigation item file #0: facade.kt +Navigation item file #0: lib/sources/facade.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/ScriptMembers.txt b/plugins/kotlin/idea/tests/testData/projectView/ScriptMembers.txt index 26279d64ba10..97db21ca227a 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/ScriptMembers.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/ScriptMembers.txt @@ -2,10 +2,10 @@ Node: build.gradle.kts User object class: KtFileTreeNode Value: KtFile: build.gradle.kts -Value file: build.gradle.kts +Value file: src/build.gradle.kts Navigation item #0: KtFile: build.gradle.kts -Navigation item file #0: build.gradle.kts +Navigation item file #0: src/build.gradle.kts -Project @@ -17,4 +17,4 @@ Navigation item file #0: build.gradle.kts repositories tasks tasks - +External Libraries \ No newline at end of file + +External Libraries diff --git a/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt b/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt index facb33d23276..8f2d3d74d2b8 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_Arrays.txt @@ -2,12 +2,12 @@ Node: ArraysKt___ArraysKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysKt.class -Value file: ArraysKt___ArraysKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysKt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysKt.class -Navigation item file #0: ArraysKt___ArraysKt.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysKt.class Navigation item #1: KtFile: ArraysKt___ArraysKt.class -Navigation item file #1: ArraysKt___ArraysKt.class +Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysKt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt index adec3f38abe8..f23ca0d37fd5 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt @@ -2,10 +2,10 @@ Node: ArraysKt___ArraysKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysKt.class -Value file: ArraysKt___ArraysKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysKt.class Navigation item #0: KtFile: _Arrays.kt -Navigation item file #0: _Arrays.kt +Navigation item file #0: kotlin-stdlib-common-sources.jar!/generated/_Arrays.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt index d97e1a415df6..b994c3fbee8f 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvm.txt @@ -2,12 +2,12 @@ Node: ArraysKt___ArraysJvmKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysJvmKt.class -Value file: ArraysKt___ArraysJvmKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysJvmKt.class Navigation item #0: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysJvmKt.class -Navigation item file #0: ArraysKt___ArraysJvmKt.class +Navigation item file #0: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysJvmKt.class Navigation item #1: KtFile: ArraysKt___ArraysJvmKt.class -Navigation item file #1: ArraysKt___ArraysJvmKt.class +Navigation item file #1: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysJvmKt.class -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt index 3eb74f4f0cf7..d33f12c02f9f 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/___ArraysJvmWithSources.txt @@ -2,10 +2,10 @@ Node: ArraysKt___ArraysJvmKt User object class: KtInternalFileTreeNode Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysJvmKt.class -Value file: ArraysKt___ArraysJvmKt.class +Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysJvmKt.class Navigation item #0: KtFile: _ArraysJvm.kt -Navigation item file #0: _ArraysJvm.kt +Navigation item file #0: kotlin-stdlib-sources.jar!/generated/_ArraysJvm.kt -Project