azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for KT-1486 Can't see class object and it children in project view when "Show Members" enabled

Browse Source
This commit is contained in:
Sergey Lukjanov
2012-03-02 00:49:59 +04:00
parent 0e4a910b4a
commit 3fc897cbcd
3 changed files with 161 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java
+63
View File
@@ -0,0 +1,63 @@
/*
* Copyright 2000-2012 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.
*/
package org.jetbrains.jet.plugin.projectView;
import com.intellij.ide.projectView.PresentationData;
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.jet.lang.psi.JetClassObject;
import java.util.Collection;
import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.canRepresentPsiElement;
import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.getClassOrObjectChildren;
/**
* @author slukjanov aka Frostman
*/
public class JetClassObjectTreeNode extends AbstractPsiBasedNode<JetClassObject> {
protected JetClassObjectTreeNode(Project project, JetClassObject classObject, ViewSettings viewSettings) {
super(project, classObject, viewSettings);
}
@Override
protected PsiElement extractPsiFromValue() {
return getValue();
}
@Override
protected Collection<AbstractTreeNode> getChildrenImpl() {
return getClassOrObjectChildren(getValue().getObjectDeclaration(), getProject(), getSettings());
}
@Override
protected void updateImpl(PresentationData data) {
data.setPresentableText("<class object>");
}
@Override
public boolean canRepresent(Object element) {
if (!isValid()) {
return false;
}
return super.canRepresent(element) || canRepresentPsiElement(getValue(), element, getSettings());
}
}
idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java
+8 -35
View File
@@ -22,14 +22,12 @@ 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 com.intellij.psi.PsiFile;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.canRepresentPsiElement;
import static org.jetbrains.jet.plugin.projectView.JetProjectViewUtil.getClassOrObjectChildren;
/**
* User: Alefas
@@ -47,18 +45,7 @@ public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<JetClassOrObj
@Override
protected Collection<AbstractTreeNode> getChildrenImpl() {
if (getSettings().isShowMembers()) {
ArrayList<AbstractTreeNode> result = new ArrayList<AbstractTreeNode>();
List<JetDeclaration> declarations = getValue().getDeclarations();
for (JetDeclaration declaration : declarations) {
if (declaration instanceof JetClassOrObject) {
result.add(new JetClassOrObjectTreeNode(getProject(), (JetClassOrObject) declaration, getSettings()));
} else {
result.add(new JetDeclarationTreeNode(getProject(), declaration, getSettings()));
}
}
return result;
} else return Collections.emptyList();
return getClassOrObjectChildren(getValue(), getProject(), getSettings());
}
@Override
@@ -71,24 +58,10 @@ public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<JetClassOrObj
@Override
public boolean canRepresent(Object element) {
if (!isValid()) return false;
return super.canRepresent(element) || canRepresent(getValue(), element);
}
private boolean canRepresent(JetClassOrObject value, Object element) {
if (value == null || !value.isValid()) return false;
PsiFile file = value.getContainingFile();
if (file != null && (file == element || file.getVirtualFile() == element)) return true;
if (value == element) return true;
if (!getSettings().isShowMembers()) {
if (element instanceof PsiElement && ((PsiElement) element).getContainingFile() != null) {
PsiFile elementFile = ((PsiElement) element).getContainingFile();
if (elementFile != null && file != null) {
return elementFile.equals(file);
}
}
if (!isValid()) {
return false;
}
return false;
return super.canRepresent(element) || canRepresentPsiElement(getValue(), element, getSettings());
}
}
idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java
+90
View File
@@ -0,0 +1,90 @@
/*
* Copyright 2000-2012 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.
*/
package org.jetbrains.jet.plugin.projectView;
import com.intellij.ide.projectView.ViewSettings;
import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import org.jetbrains.jet.lang.psi.JetClassObject;
import org.jetbrains.jet.lang.psi.JetClassOrObject;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* @author slukjanov aka Frostman
*/
public final class JetProjectViewUtil {
private JetProjectViewUtil() {
}
public static Collection<AbstractTreeNode> getClassOrObjectChildren(JetClassOrObject classOrObject, Project project,
ViewSettings settings) {
if (classOrObject != null && settings.isShowMembers()) {
Collection<AbstractTreeNode> result = new ArrayList<AbstractTreeNode>();
List<JetDeclaration> declarations = classOrObject.getDeclarations();
for (JetDeclaration declaration : declarations) {
if (declaration instanceof JetClassOrObject) {
result.add(new JetClassOrObjectTreeNode(project, (JetClassOrObject) declaration, settings));
}
else if (declaration instanceof JetClassObject) {
result.add(new JetClassObjectTreeNode(project, (JetClassObject) declaration, settings));
}
else {
result.add(new JetDeclarationTreeNode(project, declaration, settings));
}
}
return result;
}
else {
return Collections.emptyList();
}
}
public static boolean canRepresentPsiElement(PsiElement value, Object element, ViewSettings settings) {
if (value == null || !value.isValid()) {
return false;
}
PsiFile file = value.getContainingFile();
if (file != null && (file == element || file.getVirtualFile() == element)) {
return true;
}
if (value == element) {
return true;
}
if (!settings.isShowMembers()) {
if (element instanceof PsiElement && ((PsiElement) element).getContainingFile() != null) {
PsiFile elementFile = ((PsiElement) element).getContainingFile();
if (elementFile != null && file != null) {
return elementFile.equals(file);
}
}
}
return false;
}
}