From 86b5a9a93d2dc4ec6c5b65d7fb379275b4dc7653 Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Tue, 28 Nov 2023 21:03:00 +0100 Subject: [PATCH] Partial revert of the fix for KTIJ-11594 because of a regression KTIJ-27970 GitOrigin-RevId: f5d2be9cef8fa027db5793a741bb90003ac53817 --- .../kotlin/idea/projectView/projectViewProviders.kt | 9 ++++++--- .../idea/projectView/NestedFilesInProjectViewTest.kt | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt index 66e923c754ed..0c8446ec00ac 100644 --- a/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt +++ b/plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt @@ -35,16 +35,19 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware { val value = child.value val ktFile = value?.asKtFile() + // TODO need to fix KTIJ-11594 without introducing KTIJ-27970 + val mandatoryChildren = emptyList>() + if (ktFile != null) { val mainClass = KotlinIconProvider.getSingleClass(ktFile) if (mainClass != null) { - result.add(KtClassOrObjectTreeNode(ktFile.project, mainClass, settings, child.children)) + result.add(KtClassOrObjectTreeNode(ktFile.project, mainClass, settings, mandatoryChildren)) } else { - result.add(KtFileTreeNode(ktFile.project, ktFile, settings, child.children)) + result.add(KtFileTreeNode(ktFile.project, ktFile, settings, mandatoryChildren)) } } else { if (value is KtLightClass) { - result.add(KtInternalFileTreeNode(value.project, value, settings, child.children)) + result.add(KtInternalFileTreeNode(value.project, value, settings, mandatoryChildren)) } else { result.add(child) } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/NestedFilesInProjectViewTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/NestedFilesInProjectViewTest.kt index 2c0652ed3346..59e3c47ce2a5 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/NestedFilesInProjectViewTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/NestedFilesInProjectViewTest.kt @@ -5,7 +5,8 @@ import com.intellij.ide.projectView.impl.ProjectViewFileNestingService.NestingRu import com.intellij.projectView.NestedFilesInProjectViewTest import com.intellij.testFramework.fixtures.BasePlatformTestCase -class NestedFilesInProjectViewTest : BasePlatformTestCase() { +// TODO fix KTIJ-11594 without introducing KTIJ-27970 +abstract class NestedFilesInProjectViewTest : BasePlatformTestCase() { private fun doTest(showMembers: Boolean, expectedTree: String) { myFixture.addFileToProject("Foo.kt", "class Foo {val foo = 0}") myFixture.addFileToProject("Bar.kt", "class Bar1 {val bar1 = 0}\nclass Bar2 {val bar2 = 0}")