Implemented LatteStructureViewModel (fixed deprecated)

Author: mesour

latte-plugin.jar

@@ -21,6 +21,7 @@
 		<p>1.0.1</p>
 		<ul>
 			<li>Fixed compatibility issues</li>
+			<li>Fixed structure view (added n:tags and images)</li>
 		</ul>
 		<p>1.0.0</p>
 		<ul>

resources/META-INF/plugin.xml

@@ -1,34 +1,23 @@
 package com.jantvrdik.intellij.latte.editor;
 
-import com.intellij.ide.structureView.StructureView;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.ide.structureView.StructureViewModel;
-import com.intellij.ide.structureView.StructureViewModelBase;
 import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
-import com.intellij.ide.structureView.impl.StructureViewComposite;
-import com.intellij.ide.structureView.impl.TemplateLanguageStructureViewBuilder;
 import com.intellij.lang.PsiStructureViewFactory;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class LatteStructureViewFactory implements PsiStructureViewFactory{
-
 	@Nullable
 	@Override
 	public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
-		return new TemplateLanguageStructureViewBuilder(psiFile) {
+		return new TreeBasedStructureViewBuilder() {
+			@NotNull
 			@Override
-			protected StructureViewComposite.StructureViewDescriptor createMainView(FileEditor fileEditor, PsiFile mainFile) {
-				StructureView mainView = (new TreeBasedStructureViewBuilder() {
-					@NotNull
-					public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
-						return new StructureViewModelBase(psiFile, editor, new LatteStructureViewTreeElement(psiFile));
-					}
-				}).createStructureView(fileEditor, mainFile.getProject());
-				return new StructureViewComposite.StructureViewDescriptor("Latte", mainView, mainFile.getFileType().getIcon());
+			public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
+				return new LatteStructureViewModel(psiFile);
 			}
 		};
 	}

src/com/jantvrdik/intellij/latte/editor/LatteStructureViewFactory.java

@@ -0,0 +1,28 @@
+package com.jantvrdik.intellij.latte.editor;
+
+import com.intellij.ide.structureView.*;
+import com.intellij.ide.util.treeView.smartTree.Sorter;
+import com.intellij.psi.PsiFile;
+import com.jantvrdik.intellij.latte.psi.LatteFile;
+import org.jetbrains.annotations.NotNull;
+
+public class LatteStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider {
+	public LatteStructureViewModel(PsiFile psiFile) {
+		super(psiFile, new LatteStructureViewTreeElement(psiFile));
+	}
+
+	@NotNull
+	public Sorter[] getSorters() {
+		return new Sorter[]{Sorter.ALPHA_SORTER};
+	}
+
+	@Override
+	public boolean isAlwaysShowsPlus(StructureViewTreeElement element) {
+		return false;
+	}
+
+	@Override
+	public boolean isAlwaysLeaf(StructureViewTreeElement element) {
+		return element instanceof LatteFile;
+	}
+}

src/com/jantvrdik/intellij/latte/editor/LatteStructureViewModel.java

@@ -3,12 +3,15 @@
 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.ide.structureView.impl.common.PsiTreeElementBase;
 import com.intellij.psi.PsiElement;
+import com.jantvrdik.intellij.latte.icons.LatteIcons;
 import com.jantvrdik.intellij.latte.psi.LatteAutoClosedBlock;
 import com.jantvrdik.intellij.latte.psi.LatteFile;
 import com.jantvrdik.intellij.latte.psi.LatteMacroClassic;
+import com.jantvrdik.intellij.latte.psi.LatteNetteAttr;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.regex.Matcher;
@@ -28,13 +31,26 @@ public Collection<StructureViewTreeElement> getChildrenBase() {
 			return elements;
 		}
 		for (PsiElement el : getElement().getChildren()) {
-			if (el instanceof LatteMacroClassic || el instanceof LatteAutoClosedBlock) {
+			if (el instanceof LatteMacroClassic || el instanceof LatteAutoClosedBlock || el instanceof LatteNetteAttr) {
 				elements.add(new LatteStructureViewTreeElement(el));
 			}
 		}
 		return elements;
 	}
 
+	@Override
+	public Icon getIcon(boolean open) {
+		PsiElement element = getElement();
+		if (element instanceof LatteMacroClassic || element instanceof LatteAutoClosedBlock) {
+			return LatteIcons.MACRO;
+		} else if (element instanceof LatteNetteAttr) {
+			return LatteIcons.N_TAG;
+		} else if (element instanceof LatteFile) {
+			return LatteIcons.FILE;
+		}
+		return super.getIcon(open);
+	}
+
 	@Nullable
 	@Override
 	public String getPresentableText() {
@@ -52,6 +68,8 @@ public String getPresentableText() {
 
 			}
 			return presentableText;
+		} else if (element instanceof LatteNetteAttr) {
+			return ((LatteNetteAttr) element).getAttrName().getText();
 		} else if (element instanceof LatteFile) {
 			return ((LatteFile) element).getName();
 		}