Merge pull request #1796 from Haehnchen/feature/twig-extension

Twig icon extends should also support extension point

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java

@@ -97,7 +97,7 @@ public enum NamespaceType {
         "fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtension"
     );
 
-    private static final ExtensionPointName<TwigFileUsage> TWIG_FILE_USAGE_EXTENSIONS = new ExtensionPointName<>(
+    public static final ExtensionPointName<TwigFileUsage> TWIG_FILE_USAGE_EXTENSIONS = new ExtensionPointName<>(
         "fr.adrienbrault.idea.symfony2plugin.extension.TwigFileUsage"
     );
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/icon/TwigIconProvider.java

@@ -4,13 +4,13 @@
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.LayeredIcon;
 import com.jetbrains.twig.TwigFile;
 import com.jetbrains.twig.elements.TwigExtendsTag;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons;
 import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent;
+import fr.adrienbrault.idea.symfony2plugin.extension.TwigFileUsage;
 import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil;
 import icons.TwigIcons;
 import org.jetbrains.annotations.NotNull;
@@ -36,8 +36,7 @@ public Icon getIcon(@NotNull PsiElement element, @Iconable.IconFlags int flags)
         }
 
         // file provides extends tag, add another layer on top; but put the layer below the previous layer if provided
-        TwigExtendsTag childOfType = PsiTreeUtil.findChildOfType(element, TwigExtendsTag.class);
-        if (childOfType != null) {
+        if (hasFileExtendsTag(element)) {
             if (icon == null) {
                 // we are alone so just place the icon
                 icon = new LayeredIcon(TwigIcons.TwigFileIcon, Symfony2Icons.TWIG_EXTENDS_FILE);
@@ -52,6 +51,22 @@ public Icon getIcon(@NotNull PsiElement element, @Iconable.IconFlags int flags)
         return icon;
     }
 
+    private boolean hasFileExtendsTag(@NotNull PsiElement element) {
+        for (PsiElement child : element.getChildren()) {
+            if (child instanceof TwigExtendsTag) {
+                return true;
+            }
+
+            for (TwigFileUsage extension : TwigUtil.TWIG_FILE_USAGE_EXTENSIONS.getExtensions()) {
+                if (extension.isExtendsTemplate(child)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     private boolean hasController(@NotNull TwigFile twigFile) {
         return TwigUtil.findTwigFileController(twigFile).size() > 0
             || TwigUtil.getTwigFileMethodUsageOnIndex(twigFile).size() > 0;