Skip to content

Commit

Permalink
Attempting to fix structure view [ci skip]
Browse files Browse the repository at this point in the history 
#1857
  • Loading branch information
@hurricup
hurricup committed Nov 27, 2018
1 parent 71a295b commit 2ecc53f
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 146 deletions.
9 changes: 6 additions & 3 deletions core/src/com/perl5/lang/perl/idea/structureView/elements/PerlLeafStructureViewElement.java
View file
Expand Up @@ -16,10 +16,13 @@

package com.perl5.lang.perl.idea.structureView.elements;

import com.intellij.ide.util.treeView.smartTree.TreeElement;
import com.intellij.ide.structureView.StructureViewTreeElement;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;

import java.util.Collection;
import java.util.Collections;

/**
* Created by hurricup on 15.08.2015.
*/
Expand All @@ -30,7 +33,7 @@ public PerlLeafStructureViewElement(PsiElement element) {

@NotNull
@Override
public TreeElement[] getChildren() {
return new TreeElement[0];
public Collection<StructureViewTreeElement> getChildrenBase() {
return Collections.emptyList();
}
}
104 changes: 47 additions & 57 deletions core/src/com/perl5/lang/perl/idea/structureView/elements/PerlStructureViewElement.java
View file
Expand Up @@ -17,8 +17,8 @@
package com.perl5.lang.perl.idea.structureView.elements;

import com.intellij.ide.structureView.StructureViewTreeElement;
import com.intellij.ide.structureView.impl.common.PsiTreeElementBase;
import com.intellij.ide.util.treeView.smartTree.SortableTreeElement;
import com.intellij.ide.util.treeView.smartTree.TreeElement;
import com.intellij.lang.Language;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
Expand Down Expand Up @@ -50,14 +50,13 @@
/**
* Created by hurricup on 15.08.2015.
*/
public abstract class PerlStructureViewElement implements StructureViewTreeElement, SortableTreeElement {
protected PsiElement myElement;
public abstract class PerlStructureViewElement extends PsiTreeElementBase<PsiElement> implements SortableTreeElement {
protected boolean myIsInherited;
@Nullable
private PerlExportDescriptor myExportDescriptor;

public PerlStructureViewElement(PsiElement element) {
myElement = element;
public PerlStructureViewElement(PsiElement psiElement) {
super(psiElement);
}

public PerlStructureViewElement setInherited() {
Expand All @@ -83,45 +82,30 @@ public PerlExportDescriptor getExportDescriptor() {
return myExportDescriptor;
}

@Override
public Object getValue() {
return myElement;
}

@Override
public void navigate(boolean requestFocus) {
if (myElement instanceof NavigationItem) {
((NavigationItem)myElement).navigate(requestFocus);
}
}

@Override
public boolean canNavigate() {
return myElement instanceof NavigationItem &&
((NavigationItem)myElement).canNavigate();
}

@Override
public boolean canNavigateToSource() {
return myElement instanceof NavigationItem &&
((NavigationItem)myElement).canNavigateToSource();
}

@NotNull
@Override
public String getAlphaSortKey() {
assert myElement instanceof PsiNamedElement;
PsiElement element = getElement();
if (!(element instanceof PsiNamedElement)) {
return "";
}
PerlExportDescriptor exportDescriptor = getExportDescriptor();
if (exportDescriptor != null) {
return exportDescriptor.getImportedName();
}
String name = ((PsiNamedElement)myElement).getName();
String name = ((PsiNamedElement)element).getName();
if (name == null) {
name = "Empty named " + myElement;
name = "Empty named " + element;
}
return name;
}

@Nullable
@Override
public String getPresentableText() {
throw new RuntimeException("Should not be invoked or should be overrode");
}

@NotNull
@Override
public ItemPresentation getPresentation() {
Expand Down Expand Up @@ -149,23 +133,29 @@ public ItemPresentation getPresentation() {
@NotNull
protected ItemPresentation createPresentation() {
ItemPresentation result = null;
if (myElement instanceof NavigationItem) {
result = ((NavigationItem)myElement).getPresentation();
PsiElement element = getElement();
if (element instanceof NavigationItem) {
result = ((NavigationItem)element).getPresentation();
}

return result == null ? new PerlItemPresentationSimple(myElement, "FIXME") : result;
return result == null ? new PerlItemPresentationSimple(element, "FIXME") : result;
}


@NotNull
@Override
public TreeElement[] getChildren() {
List<TreeElement> result = new ArrayList<>();
public Collection<StructureViewTreeElement> getChildrenBase() {

PsiElement psiElement = getElement();
if (psiElement == null) {
return Collections.emptyList();
}

List<StructureViewTreeElement> result = new ArrayList<>();

Set<String> implementedMethods = new HashSet<>();

if (myElement instanceof PerlFile) {
FileViewProvider viewProvider = ((PerlFile)myElement).getViewProvider();
if (psiElement instanceof PerlFile) {
FileViewProvider viewProvider = ((PerlFile)psiElement).getViewProvider();
PsiFile podFile = viewProvider.getPsi(PodLanguage.INSTANCE);
if (podFile != null && podFile.getChildren().length > 1) {
result.add(new PodStructureViewElement(podFile));
Expand All @@ -192,19 +182,19 @@ public void visitNamespaceDefinitionElement(@NotNull PerlNamespaceDefinitionElem
});
}
}
if (myElement instanceof PerlNamespaceDefinitionElement) {
if (psiElement instanceof PerlNamespaceDefinitionElement) {
// global variables
for (PerlVariableDeclarationElement child : PsiTreeUtil.findChildrenOfType(myElement, PerlVariableDeclarationElement.class)) {
if (child.isGlobalDeclaration() && myElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
for (PerlVariableDeclarationElement child : PsiTreeUtil.findChildrenOfType(psiElement, PerlVariableDeclarationElement.class)) {
if (child.isGlobalDeclaration() && psiElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
result.add(new PerlVariableDeclarationStructureViewElement(child));
}
}

Project project = myElement.getProject();
Project project = psiElement.getProject();
GlobalSearchScope projectScope = GlobalSearchScope.projectScope(project);

// imported scalars
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)myElement).getImportedScalarDescriptors()) {
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)psiElement).getImportedScalarDescriptors()) {
String canonicalName = exportDescritptor.getTargetCanonicalName();

Collection<PerlVariableDeclarationElement> variables = PerlScalarUtil.getGlobalScalarDefinitions(project, canonicalName);
Expand All @@ -225,7 +215,7 @@ public void visitNamespaceDefinitionElement(@NotNull PerlNamespaceDefinitionElem
}

// imported arrays
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)myElement).getImportedArrayDescriptors()) {
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)psiElement).getImportedArrayDescriptors()) {
String canonicalName = exportDescritptor.getTargetCanonicalName();

Collection<PerlVariableDeclarationElement> variables = PerlArrayUtil.getGlobalArrayDefinitions(project, canonicalName);
Expand All @@ -246,7 +236,7 @@ public void visitNamespaceDefinitionElement(@NotNull PerlNamespaceDefinitionElem
}

// imported hashes
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)myElement).getImportedHashDescriptors()) {
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)psiElement).getImportedHashDescriptors()) {
String canonicalName = exportDescritptor.getTargetCanonicalName();

Collection<PerlVariableDeclarationElement> variables = PerlHashUtil.getGlobalHashDefinitions(project, canonicalName);
Expand All @@ -267,7 +257,7 @@ public void visitNamespaceDefinitionElement(@NotNull PerlNamespaceDefinitionElem
}

// Imported subs
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)myElement).getImportedSubsDescriptors()) {
for (PerlExportDescriptor exportDescritptor : ((PerlNamespaceDefinitionElement)psiElement).getImportedSubsDescriptors()) {
String canonicalName = exportDescritptor.getTargetCanonicalName();

// declarations
Expand Down Expand Up @@ -301,10 +291,10 @@ public void visitNamespaceDefinitionElement(@NotNull PerlNamespaceDefinitionElem
}
}

myElement.accept(new PerlRecursiveVisitor() {
psiElement.accept(new PerlRecursiveVisitor() {
@Override
public void visitPerlSubDefinitionElement(@NotNull PerlSubDefinitionElement child) {
if (myElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
if (psiElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
implementedMethods.add(child.getName());

result.add(new PerlSubStructureViewElement(child));
Expand All @@ -314,15 +304,15 @@ public void visitPerlSubDefinitionElement(@NotNull PerlSubDefinitionElement chil

@Override
public void visitSubDeclarationElement(@NotNull PerlSubDeclarationElement child) {
if (myElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
if (psiElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
result.add(new PerlSubStructureViewElement(child));
}
super.visitSubDeclarationElement(child);
}

@Override
public void visitGlobVariable(@NotNull PsiPerlGlobVariable child) {
if (child.isLeftSideOfAssignment() && myElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
if (child.isLeftSideOfAssignment() && psiElement.isEquivalentTo(PerlPackageUtil.getNamespaceContainerForElement(child))) {
implementedMethods.add(child.getName());
result.add(new PerlGlobStructureViewElement(child));
}
Expand All @@ -332,13 +322,13 @@ public void visitGlobVariable(@NotNull PsiPerlGlobVariable child) {
}

// inherited elements
if (myElement instanceof PerlNamespaceDefinitionWithIdentifier) {
List<TreeElement> inheritedResult = new ArrayList<>();
if (psiElement instanceof PerlNamespaceDefinitionWithIdentifier) {
List<StructureViewTreeElement> inheritedResult = new ArrayList<>();

String packageName = ((PerlNamespaceDefinitionElement)myElement).getPackageName();
String packageName = ((PerlNamespaceDefinitionElement)psiElement).getPackageName();

if (packageName != null) {
for (PsiElement element : PerlMro.getVariants(myElement, packageName, true)) {
for (PsiElement element : PerlMro.getVariants(psiElement, packageName, true)) {
if (element instanceof PerlIdentifierOwner && !implementedMethods.contains(((PerlIdentifierOwner)element).getName())) {
if (element instanceof PerlLightConstantDefinitionElement) {
inheritedResult.add(new PerlSubStructureViewElement((PerlSubDefinitionElement)element).setInherited());
Expand All @@ -363,6 +353,6 @@ else if (element instanceof PerlGlobVariable &&
}
}

return result.toArray(new TreeElement[result.size()]);
return result;
}
}
8 changes: 5 additions & 3 deletions core/src/com/perl5/lang/perl/idea/structureView/elements/PerlSubStructureViewElement.java
View file
Expand Up @@ -16,6 +16,7 @@

package com.perl5.lang.perl.idea.structureView.elements;

import com.intellij.psi.PsiElement;
import com.perl5.lang.perl.parser.constant.psi.light.PerlLightConstantDefinitionElement;
import com.perl5.lang.perl.psi.PerlSubDeclarationElement;
import com.perl5.lang.perl.psi.PerlSubDefinitionElement;
Expand All @@ -34,12 +35,13 @@ public PerlSubStructureViewElement(PerlSubDeclarationElement element) {
}

public boolean isDeclaration() {
return myElement instanceof PerlSubDeclarationElement;
return getElement() instanceof PerlSubDeclarationElement;
}

public boolean isMethod() {
return myElement instanceof PerlSubElement && ((PerlSubElement)myElement).isMethod();
PsiElement element = getElement();
return element instanceof PerlSubElement && ((PerlSubElement)element).isMethod();
}

public boolean isConstant() {return myElement instanceof PerlLightConstantDefinitionElement;}
public boolean isConstant() {return getElement() instanceof PerlLightConstantDefinitionElement;}
}

0 comments on commit 2ecc53f

Please sign in to comment.