MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Partial revert of the fix for KTIJ-11594 because of a regression KTIJ-27970

Browse Source 
GitOrigin-RevId: f5d2be9cef8fa027db5793a741bb90003ac53817
This commit is contained in:
Alexander Doroshko
2023-11-28 21:12:22 +00:00
committed by intellij-monorepo-bot
parent 487b46bc7f
commit 86b5a9a93d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/project-structure/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt
+6 -3
View File
@@ -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<AbstractTreeNode<*>>()
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)
}
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/projectView/NestedFilesInProjectViewTest.kt
+2 -1
View File
@@ -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}")