From a0c9b275aa607b9fdfc29760584936c20b9c0729 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Tue, 4 Feb 2020 13:41:11 +0100 Subject: [PATCH] Removed deprecated usage of treeBuilder from currentProjectViewPane It is outdated behaviour as all nested members have to appear as children of file rather children of its package #KT-35918 Comment --- .../projectView/KtClassOrObjectTreeNode.kt | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.kt index 5382515f728..0d6e3e1a40d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.kt +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.kt @@ -6,13 +6,11 @@ package org.jetbrains.kotlin.idea.projectView import com.intellij.ide.projectView.PresentationData -import com.intellij.ide.projectView.ProjectView import com.intellij.ide.projectView.ViewSettings import com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode import com.intellij.ide.util.treeView.AbstractTreeNode import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.idea.KotlinIconProvider import org.jetbrains.kotlin.idea.structureView.getStructureDeclarations import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtPsiUtil @@ -35,28 +33,9 @@ class KtClassOrObjectTreeNode(project: Project?, ktClassOrObject: KtClassOrObjec } } - private fun update(node: AbstractTreeNode<*>) { - val project = project - if (project != null) { - ProjectView.getInstance(project).currentProjectViewPane?.treeBuilder?.addSubtreeToUpdateByElement(node) - } - } - override fun updateImpl(data: PresentationData) { - val classOrObject = value - if (classOrObject != null) { - data.presentableText = classOrObject.name - - val parent = parent - if (KotlinIconProvider.getMainClass(classOrObject.containingKtFile) != null) { - if (parent is KtFileTreeNode) { - update(parent.getParent()) - } - } else { - if (parent !is KtClassOrObjectTreeNode && parent !is KtFileTreeNode) { - update(parent) - } - } + value?.let { + data.presentableText = it.name } }