feat: update icons

Author: xepozz

src/main/kotlin/com/github/xepozz/testo/TestoIcons.kt

@@ -14,29 +14,60 @@ object TestoIcons {
     object PHP {
         @JvmField
         val FILE = IconLoader.getIcon("/icons/php/file.svg", this::class.java)
+
         @JvmField
         val CLASS = IconLoader.getIcon("/icons/php/class.svg", this::class.java)
+
         @JvmField
         val CLASS_ABSTRACT = IconLoader.getIcon("/icons/php/classAbstract.svg", this::class.java)
-    }
 
-    val TEST_FILE = LayeredIcon.layeredIcon {
-        arrayOf(
-            PHP.FILE,
-            AllIcons.Nodes.JunitTestMark,
-        )
-    }
-    val FINAL_TESTO_CLASS = LayeredIcon.layeredIcon {
-        arrayOf(
-            PHP.CLASS,
-            AllIcons.Nodes.FinalMark,
-            AllIcons.Nodes.JunitTestMark,
-        )
+        @JvmField
+        val FUNCTION = IconLoader.getIcon("/icons/php/function.svg", this::class.java)
     }
-    val ABSTRACT_TESTO_CLASS = LayeredIcon.layeredIcon {
-        arrayOf(
-            PHP.CLASS_ABSTRACT,
-            AllIcons.Nodes.JunitTestMark,
-        )
+
+    object Layered {
+        @JvmField
+        val FILE = LayeredIcon.layeredIcon {
+            arrayOf(
+                PHP.FILE,
+                AllIcons.Nodes.JunitTestMark,
+            )
+        }
+
+        @JvmField
+        val FUNCTION = LayeredIcon.layeredIcon {
+            arrayOf(
+                PHP.FUNCTION,
+                AllIcons.Nodes.JunitTestMark,
+            )
+        }
+
+        object Class {
+            @JvmField
+            val CLASS = LayeredIcon.layeredIcon {
+                arrayOf(
+                    PHP.CLASS,
+                    AllIcons.Nodes.JunitTestMark,
+                )
+            }
+
+            @JvmField
+            val CLASS_FINAL = LayeredIcon.layeredIcon {
+                arrayOf(
+                    PHP.CLASS,
+                    AllIcons.Nodes.FinalMark,
+                    AllIcons.Nodes.JunitTestMark,
+                )
+            }
+
+            @JvmField
+            val CLASS_ABSTRACT = LayeredIcon.layeredIcon {
+                arrayOf(
+                    PHP.CLASS_ABSTRACT,
+                    AllIcons.Nodes.JunitTestMark,
+                )
+            }
+        }
     }
+
 }

src/main/kotlin/com/github/xepozz/testo/mixin.kt

@@ -21,15 +21,16 @@ fun PsiElement.isTestoClass() = when (this) {
 }
 
 fun PsiFile.isTestoFile() = when (this) {
-    is PhpFile -> name.endsWith("Test") ||
-            PsiTreeUtil.findChildrenOfType(this, PhpClass::class.java)
-                .any { it.isTestoClass() } ||
-            PsiTreeUtil.findChildrenOfType(this, Function::class.java)
-                .any { it.isTestoMethod() }
-
+    is PhpFile -> name.endsWith("Test") || isTestoClassFile() || isTestoFunctionFile()
     else -> false
 }
 
+fun PhpFile.isTestoClassFile() = PsiTreeUtil.findChildrenOfType(this, PhpClass::class.java)
+    .any { it.isTestoClass() }
+
+fun PhpFile.isTestoFunctionFile() = PsiTreeUtil.findChildrenOfType(this, Function::class.java)
+    .any { it.isTestoMethod() }
+
 fun <T> Sequence<T>.takeWhileInclusive(predicate: (T) -> Boolean) = sequence {
     with(iterator()) {
         while (hasNext()) {

src/main/kotlin/com/github/xepozz/testo/ui/TestoIconProvider.kt

@@ -16,13 +16,14 @@ class TestoIconProvider : IconProvider() {
 
         if (!phpFile.isTestoFile()) return null
 
-        val phpClass = PsiTreeUtil.findChildOfType(phpFile, PhpClass::class.java)
+        val phpClasses = PsiTreeUtil.findChildrenOfType(phpFile, PhpClass::class.java)
 
         return when {
-            phpClass == null -> TestoIcons.TEST_FILE
-            phpClass.modifier.isAbstract -> TestoIcons.ABSTRACT_TESTO_CLASS
-            phpClass.modifier.isFinal -> TestoIcons.FINAL_TESTO_CLASS
-            else -> TestoIcons.TEST_FILE
+            phpClasses.isEmpty() -> TestoIcons.Layered.FUNCTION
+            phpClasses.size > 1 -> TestoIcons.Layered.FILE
+            phpClasses.first().modifier.isAbstract -> TestoIcons.Layered.Class.CLASS_ABSTRACT
+            phpClasses.first().modifier.isFinal -> TestoIcons.Layered.Class.CLASS_FINAL
+            else -> TestoIcons.Layered.Class.CLASS
         }
     }
 }