From 5a990cdbd43d6a2e8a8216ccc01c731c94c8c83a Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Sat, 13 Dec 2025 02:22:35 +0100 Subject: [PATCH] [kotlin] KTIJ-36850 Move `AbstractKotlinProjectViewTest.kt` to `intellij.kotlin.base.test` Also update testData for `KotlinProjectViewTestGenerated` test It seems like the ordering of the libraries might have changed, hence the change in the `Navigation item file` difference GitOrigin-RevId: afcd5045cfd2a61ac77703b4bc2f0d15819ae31d --- .../testData/projectView/AnnotationFromStdlibWithSources.txt | 2 +- .../idea/tests/testData/projectView/_ArraysWithSources.txt | 2 +- .../tests/testData/projectView/_ArraysWithSourcesMembers.txt | 2 +- plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel | 1 + .../intellij.kotlin.base.test/intellij.kotlin.base.test.iml | 1 + .../kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt | 4 ++-- 6 files changed, 7 insertions(+), 5 deletions(-) rename plugins/kotlin/{idea/tests => intellij.kotlin.base.test}/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt (98%) diff --git a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt index 36d3ae98d5da..e3e1bac16dbe 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/AnnotationFromStdlibWithSources.txt @@ -7,7 +7,7 @@ Value file: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.class Navigation item #0: CLASS Navigation item file #0: kotlin-stdlib.jar!/kotlin/annotation/AnnotationTarget.class Navigation item #1: CLASS -Navigation item file #1: kotlin-stdlib-sources.jar!/commonMain/kotlin/annotation/Annotations.kt +Navigation item file #1: kotlin-stdlib-common-sources.jar!/commonMain/kotlin/annotation/Annotations.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt index eb608812f5fc..400f6cd6f4e5 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSources.txt @@ -5,7 +5,7 @@ Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysKt.class Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysKt.class Navigation item #0: KtFile: _Arrays.kt -Navigation item file #0: kotlin-stdlib-sources.jar!/commonMain/generated/_Arrays.kt +Navigation item file #0: kotlin-stdlib-common-sources.jar!/commonMain/generated/_Arrays.kt -Project diff --git a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt index eec7e5d9bfff..8fb3cb0b88ea 100644 --- a/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt +++ b/plugins/kotlin/idea/tests/testData/projectView/_ArraysWithSourcesMembers.txt @@ -5,7 +5,7 @@ Value: KtLightClassForDecompiledDeclaration of PsiFile:ArraysKt___ArraysKt.class Value file: kotlin-stdlib.jar!/kotlin/collections/ArraysKt___ArraysKt.class Navigation item #0: KtFile: _Arrays.kt -Navigation item file #0: kotlin-stdlib-sources.jar!/commonMain/generated/_Arrays.kt +Navigation item file #0: kotlin-stdlib-common-sources.jar!/commonMain/generated/_Arrays.kt -Project diff --git a/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel b/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel index a682b2c55db6..287de9e0684b 100644 --- a/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel +++ b/plugins/kotlin/intellij.kotlin.base.test/BUILD.bazel @@ -73,6 +73,7 @@ jvm_library( "//java/openapi:java", "//java/idea-ui:ui", "@lib//:jet_check", + "//platform/structure-view-impl:structureView-impl", ] ) ### auto-generated section `build intellij.kotlin.base.test` end diff --git a/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml b/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml index b35b9f5599cd..8515886a3560 100644 --- a/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml +++ b/plugins/kotlin/intellij.kotlin.base.test/intellij.kotlin.base.test.iml @@ -62,5 +62,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt b/plugins/kotlin/intellij.kotlin.base.test/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt similarity index 98% rename from plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt rename to plugins/kotlin/intellij.kotlin.base.test/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt index 7972f0cc5228..ddc0d626bd1a 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt +++ b/plugins/kotlin/intellij.kotlin.base.test/test/org/jetbrains/kotlin/idea/projectView/AbstractKotlinProjectViewTest.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.projectView import com.intellij.ide.projectView.impl.ProjectViewFileNestingService @@ -134,4 +134,4 @@ abstract class AbstractKotlinProjectViewTest : KotlinMultiFileHeavyProjectTestCa private object Holder { val STDLIB_REGEX: Regex = Regex("(kotlin-stdlib.*?)(-\\d.*)([.]jar)") } -} +} \ No newline at end of file