Skip to content
Snippets Groups Projects

Resolve "Structure View Support"

Merged Johannes Mey requested to merge feature/structure-view-support into develop
1 file
+ 7
10
Compare changes
  • Side-by-side
  • Inline
@@ -6,7 +6,6 @@ import com.intellij.ide.structureView.StructureViewTreeElement;
import com.intellij.ide.util.treeView.smartTree.SortableTreeElement;
import com.intellij.ide.util.treeView.smartTree.TreeElement;
import com.intellij.navigation.ItemPresentation;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.psi.NavigatablePsiElement;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
@@ -14,7 +13,6 @@ import org.jastadd.tooling.aspect.psi.*;
import org.jastadd.tooling.aspect.psi.impl.*;
import org.jastadd.tooling.util.JastAddIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.Objects;
@@ -232,23 +230,22 @@ public class AspectStructureViewElement implements StructureViewTreeElement, Sor
return new AspectStructureViewElement((JastAddAspectAspectInterfaceDeclarationImpl) decl.getAspectInterfaceDeclaration());
} else if (decl.getAspectFieldDeclaration() != null) {
return new AspectStructureViewElement((JastAddAspectAspectFieldDeclarationImpl) decl.getAspectFieldDeclaration());
} else if (decl.getAspectConstructorDeclaration()!= null) {
} else if (decl.getAspectConstructorDeclaration() != null) {
return new AspectStructureViewElement((JastAddAspectAspectConstructorDeclarationImpl) decl.getAspectConstructorDeclaration());
}else if (decl.getAspectRewrite()!= null) {
} else if (decl.getAspectRewrite() != null) {
return new AspectStructureViewElement((JastAddAspectAspectRewriteImpl) decl.getAspectRewrite());
}
// missing cases include:
// aspect_refine_method_declaration
// aspect_refine_constructor_declaration
// aspect_add_interface
// aspect_extend_interface
return null;
})
.filter(Objects::nonNull)
.toArray(TreeElement[]::new);
}
// aspect_refine_method_declaration
// aspect_refine_constructor_declaration
// aspect_add_interface
// aspect_extend_interface
return EMPTY_ARRAY;
}
Loading