From 073d48d591e6fba254ee9dc43533e01a5582c638 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 17 Apr 2018 17:54:24 +0300 Subject: [PATCH] IDEA-189793: update package root node if top-level package is changed --- .../impl/nodes/PackageViewProjectNode.java | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java index 78e65cd8a355..af484fddf563 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.projectView.impl.nodes; import com.intellij.ide.projectView.ViewSettings; @@ -39,6 +25,25 @@ public class PackageViewProjectNode extends AbstractProjectNode { super(project, project, viewSettings); } + @Override + public boolean canRepresent(Object element) { + Project project = getValue(); + if (project == element) return true; + if (element instanceof PsiDirectory) { + PsiDirectory directory = (PsiDirectory)element; + element = directory.getVirtualFile(); + } + if (element instanceof VirtualFile) { + ProjectRootManager manager = project == null || project.isDisposed() ? null : ProjectRootManager.getInstance(project); + if (manager != null) { + for (VirtualFile root : manager.getContentSourceRoots()) { + if (element.equals(root)) return true; + } + } + } + return false; + } + @Override @NotNull public Collection getChildren() {