Merge remote-tracking branch 'origin/main' into claude/create-claude-md-docs-TbEpZ

Author: claude

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

@@ -1,8 +1,8 @@
 package com.github.xepozz.testo
 
 object TestoClasses {
-    const val TEST_OLD = "\\Testo\\Attribute\\Test"
-    const val TEST_NEW = "\\Testo\\Application\\Attribute\\Test"
+    const val TEST_NEW = "\\Testo\\Attribute\\Test"
+    const val TEST_OLD = "\\Testo\\Application\\Attribute\\Test"
     const val TEST_INLINE_OLD = "\\Testo\\Sample\\TestInline"
     const val TEST_INLINE_NEW = "\\Testo\\Inline\\TestInline"
 
@@ -19,4 +19,25 @@ object TestoClasses {
     const val ASSERT = "\\Testo\\Assert"
     const val ASSERTION_EXCEPTION = "\\Testo\\Assert\\State\\Assertion\\AssertionException"
     const val EXPECT = "\\Testo\\Expect"
+
+    val DATA_ATTRIBUTES = arrayOf(
+        DATA_PROVIDER_OLD,
+        DATA_PROVIDER_NEW,
+        DATA_SET_OLD,
+        DATA_SET_NEW,
+        DATA_UNION,
+        DATA_CROSS,
+        DATA_ZIP,
+    )
+    val TEST_ATTRIBUTES = arrayOf(
+        TEST_NEW,
+        TEST_OLD,
+    )
+    val TEST_INLINE_ATTRIBUTES = arrayOf(
+        TEST_INLINE_OLD,
+        TEST_INLINE_NEW,
+    )
+    val BENCH_ATTRIBUTES = arrayOf(
+        BENCH_WITH,
+    )
 }

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

@@ -13,17 +13,17 @@ import com.jetbrains.php.lang.psi.elements.PhpClass
 fun PsiElement.isTestoExecutable() = isTestoFunction() || isTestoMethod() || isTestoBench()
 
 fun PsiElement.isTestoBench() = when(this) {
-    is Method -> hasAnyAttribute(TestoClasses.BENCH_WITH)
+    is Method -> hasAnyAttribute(*TestoClasses.BENCH_ATTRIBUTES)
     else -> false
 }
 
 fun PsiElement.isTestoFunction() = when(this) {
-    is Function -> hasAnyAttribute(TestoClasses.TEST_OLD,TestoClasses.TEST_NEW, TestoClasses.TEST_INLINE_NEW, TestoClasses.TEST_INLINE_OLD)
+    is Function -> hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES, *TestoClasses.TEST_INLINE_ATTRIBUTES)
     else -> false
 }
 
 fun PsiElement.isTestoMethod() = when(this) {
-    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(TestoClasses.TEST_OLD,TestoClasses.TEST_NEW, TestoClasses.TEST_INLINE_NEW, TestoClasses.TEST_INLINE_OLD)
+    is Method -> (modifier.isPublic && name.startsWith("test")) || hasAnyAttribute(*TestoClasses.TEST_ATTRIBUTES, *TestoClasses.TEST_INLINE_ATTRIBUTES)
     else -> false
 }
 

src/main/kotlin/com/github/xepozz/testo/tests/TestoTestRunLineMarkerProvider.kt

@@ -87,16 +87,9 @@ class TestoTestRunLineMarkerProvider : RunLineMarkerContributor() {
 
     companion object Companion {
         val RUNNABLE_ATTRIBUTES = arrayOf(
-            TestoClasses.DATA_PROVIDER_OLD,
-            TestoClasses.DATA_PROVIDER_NEW,
-            TestoClasses.DATA_SET_OLD,
-            TestoClasses.DATA_SET_NEW,
-            TestoClasses.DATA_UNION,
-            TestoClasses.DATA_CROSS,
-            TestoClasses.DATA_ZIP,
-            TestoClasses.TEST_INLINE_OLD,
-            TestoClasses.TEST_INLINE_NEW,
-            TestoClasses.BENCH_WITH,
+            *TestoClasses.DATA_ATTRIBUTES,
+            *TestoClasses.TEST_INLINE_ATTRIBUTES,
+            *TestoClasses.BENCH_ATTRIBUTES,
         )
 
         fun getLocationHint(element: Function) = when (element) {

src/main/kotlin/com/github/xepozz/testo/util/PsiUtil.kt

@@ -8,18 +8,10 @@ import com.jetbrains.php.lang.psi.elements.PhpAttributesOwner
 
 object PsiUtil {
     val MEANINGFUL_ATTRIBUTES = arrayOf(
-        TestoClasses.TEST_OLD,
-        TestoClasses.TEST_NEW,
-        TestoClasses.TEST_INLINE_OLD,
-        TestoClasses.TEST_INLINE_NEW,
-        TestoClasses.DATA_PROVIDER_OLD,
-        TestoClasses.DATA_PROVIDER_NEW,
-        TestoClasses.DATA_SET_OLD,
-        TestoClasses.DATA_SET_NEW,
-        TestoClasses.DATA_UNION,
-        TestoClasses.DATA_CROSS,
-        TestoClasses.DATA_ZIP,
-        TestoClasses.BENCH_WITH,
+        *TestoClasses.DATA_ATTRIBUTES,
+        *TestoClasses.TEST_ATTRIBUTES,
+        *TestoClasses.TEST_INLINE_ATTRIBUTES,
+        *TestoClasses.BENCH_ATTRIBUTES,
     )
 
     fun getAttributeOrder(attribute: PhpAttribute, owner: PhpAttributesOwner): Int = owner