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

Author: xepozz

CLAUDE.md

@@ -144,7 +144,6 @@ The plugin recognizes PHP attributes defined in `TestoClasses.kt`. Constants are
 | Group (array)            | Attributes (FQN)                                                                  |
 |--------------------------|-----------------------------------------------------------------------------------|
 | `TEST_ATTRIBUTES`        | `\Testo\Test`, `\Testo\Inline\TestInline`                                        |
-| `TEST_INLINE_ATTRIBUTES` | `\Testo\Inline\TestInline`                                                        |
 | `DATA_ATTRIBUTES`        | `\Testo\Data\DataProvider`, `\Testo\Data\DataSet`, `\Testo\Data\DataUnion`, `\Testo\Data\DataCross`, `\Testo\Data\DataZip` |
 | `BENCH_ATTRIBUTES`       | `\Testo\Bench`                                                                    |
 
@@ -154,13 +153,13 @@ These arrays are spread into `RUNNABLE_ATTRIBUTES` (line markers) and `MEANINGFU
 
 ### Attribute Group Numbering
 
-Attributes on a function/method are numbered **within their own group**, not globally. Each group has independent 0-based indexing. The groups are defined in `PsiUtil.ATTRIBUTE_GROUPS`:
+Attributes on a function/method are numbered **within their own group**, not globally. Each group has independent 0-based indexing:
 
-| Group             | Source array              | Used for                                      |
-|-------------------|---------------------------|-----------------------------------------------|
-| test data         | `DATA_ATTRIBUTES`         | Data providers for `#[Test]` methods          |
-| inline            | `TEST_INLINE_ATTRIBUTES`  | Inline test cases (`#[TestInline]`)           |
-| bench             | `BENCH_ATTRIBUTES`        | Benchmark data (`#[Bench]`)                   |
+- **test data** group: all `DATA_ATTRIBUTES` (DataProvider, DataSet, DataUnion, DataCross, DataZip) share one group — numbered together
+- **inline** group: each `TestInline` is numbered among other `TestInline` attributes (same FQN)
+- **bench** group: each `Bench` is numbered among other `Bench` attributes (same FQN)
+
+Explicit multi-attribute groups are defined in `PsiUtil.ATTRIBUTE_GROUPS` (currently only `DATA_ATTRIBUTES`). All other meaningful attributes (except `Test`) are grouped by their own FQN — attributes with the same FQN form a group automatically.
 
 The `#[Test]` attribute itself is **not numbered** — it is a marker only. The method/function name already gets its own gutter line marker.
 
@@ -178,13 +177,13 @@ Example for a function `foo` with multiple attributes:
 #[Bench(...)]           → type=bench, foo:1
 ```
 
-`RUNNABLE_ATTRIBUTES` (used for gutter line markers) contains `TEST_INLINE_ATTRIBUTES + BENCH_ATTRIBUTES + DATA_ATTRIBUTES` — it does **not** include `Test` since the method already gets a run marker via `getLocationInfo`.
+`RUNNABLE_ATTRIBUTES` (used for gutter line markers) contains `TestInline + BENCH_ATTRIBUTES + DATA_ATTRIBUTES` — it does **not** include `Test` since the method already gets a run marker via `getLocationInfo`.
 
 ### Test Detection Logic (mixin.kt)
 
 A PHP element is recognized as a Testo test when:
-- **Method:** public + name starts with `test`, OR has any `TEST_ATTRIBUTES` / `TEST_INLINE_ATTRIBUTES`
-- **Function:** has any `TEST_ATTRIBUTES` / `TEST_INLINE_ATTRIBUTES` (standalone test functions)
+- **Method:** public + name starts with `test`, OR has any `TEST_ATTRIBUTES`
+- **Function:** has any `TEST_ATTRIBUTES` (standalone test functions)
 - **Benchmark:** has any `BENCH_ATTRIBUTES`
 - **Class:** name ends with `Test` or `TestBase`, OR contains test/bench methods
 - **File:** filename matches test class pattern, OR contains test classes/functions/benchmarks

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

@@ -30,9 +30,6 @@ object TestoClasses {
         TEST,
         TEST_INLINE,
     )
-    val TEST_INLINE_ATTRIBUTES = arrayOf(
-        TEST_INLINE,
-    )
     val BENCH_ATTRIBUTES = arrayOf(
         BENCH,
     )

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

@@ -96,7 +96,7 @@ class TestoTestRunLineMarkerProvider : RunLineMarkerContributor() {
 
     companion object Companion {
         val RUNNABLE_ATTRIBUTES = arrayOf(
-            *TestoClasses.TEST_INLINE_ATTRIBUTES,
+            TestoClasses.TEST_INLINE,
             *TestoClasses.BENCH_ATTRIBUTES,
             *TestoClasses.DATA_ATTRIBUTES,
         )

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

@@ -15,15 +15,19 @@ object PsiUtil {
 
     val ATTRIBUTE_GROUPS: Array<Array<String>> = arrayOf(
         TestoClasses.DATA_ATTRIBUTES,
-        TestoClasses.TEST_INLINE_ATTRIBUTES,
-        TestoClasses.BENCH_ATTRIBUTES,
     )
 
-    fun getAttributeGroup(fqn: String?): Array<String>? =
-        ATTRIBUTE_GROUPS.firstOrNull { fqn in it }
+    fun getAttributeGroup(fqn: String?): Array<String>? {
+        if (fqn == null) return null
+        val group = ATTRIBUTE_GROUPS.firstOrNull { fqn in it }
+        if (group != null) return group
+        if (fqn in MEANINGFUL_ATTRIBUTES && fqn != TestoClasses.TEST) return arrayOf(fqn)
+        return null
+    }
 
     fun getAttributeOrder(attribute: PhpAttribute, owner: PhpAttributesOwner): Int {
-        val group = getAttributeGroup(attribute.fqn) ?: return -1
+        val fqn = attribute.fqn ?: return -1
+        val group = getAttributeGroup(fqn) ?: return -1
         return owner.attributes
             .filter { it.fqn in group }
             .indexOf(attribute)

src/test/kotlin/com/github/xepozz/testo/PsiUtilTest.kt

@@ -63,16 +63,16 @@ class PsiUtilTest : TestCase() {
         assertSame(TestoClasses.DATA_ATTRIBUTES, group)
     }
 
-    fun testGetAttributeGroup_testInlineInInlineGroup() {
+    fun testGetAttributeGroup_testInlineHasGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.TEST_INLINE)
         assertNotNull("TestInline should have a group", group)
-        assertSame(TestoClasses.TEST_INLINE_ATTRIBUTES, group)
+        assertTrue(group!!.contains(TestoClasses.TEST_INLINE))
     }
 
-    fun testGetAttributeGroup_benchInBenchGroup() {
+    fun testGetAttributeGroup_benchHasGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.BENCH)
         assertNotNull("Bench should have a group", group)
-        assertSame(TestoClasses.BENCH_ATTRIBUTES, group)
+        assertTrue(group!!.contains(TestoClasses.BENCH))
     }
 
     fun testGetAttributeGroup_testHasNoGroup() {
@@ -88,7 +88,26 @@ class PsiUtilTest : TestCase() {
         assertNull(PsiUtil.getAttributeGroup("\\Some\\Unknown\\Attribute"))
     }
 
-    fun testAttributeGroups_allGroupedAttributesAreInMeaningful() {
+    fun testGetAttributeGroup_allDataAttributesShareSameGroup() {
+        val groups = TestoClasses.DATA_ATTRIBUTES.map { PsiUtil.getAttributeGroup(it) }
+        val first = groups.first()
+        for (group in groups) {
+            assertSame("All data attributes should share the same group instance", first, group)
+        }
+    }
+
+    fun testGetAttributeGroup_inlineAndBenchAreSeparateGroups() {
+        val inlineGroup = PsiUtil.getAttributeGroup(TestoClasses.TEST_INLINE)
+        val benchGroup = PsiUtil.getAttributeGroup(TestoClasses.BENCH)
+        assertNotNull(inlineGroup)
+        assertNotNull(benchGroup)
+        assertFalse(
+            "Inline and bench groups should not overlap",
+            inlineGroup!!.toSet().intersect(benchGroup!!.toSet()).isNotEmpty()
+        )
+    }
+
+    fun testAttributeGroups_allExplicitGroupsAreInMeaningful() {
         val meaningful = PsiUtil.MEANINGFUL_ATTRIBUTES.toSet()
         for (group in PsiUtil.ATTRIBUTE_GROUPS) {
             for (attr in group) {
@@ -97,7 +116,7 @@ class PsiUtilTest : TestCase() {
         }
     }
 
-    fun testAttributeGroups_noOverlapBetweenGroups() {
+    fun testAttributeGroups_noOverlapBetweenExplicitGroups() {
         val groups = PsiUtil.ATTRIBUTE_GROUPS
         for (i in groups.indices) {
             for (j in i + 1 until groups.size) {
@@ -106,12 +125,4 @@ class PsiUtilTest : TestCase() {
             }
         }
     }
-
-    fun testAttributeGroups_totalCount() {
-        val totalGrouped = PsiUtil.ATTRIBUTE_GROUPS.sumOf { it.size }
-        val expectedGrouped = TestoClasses.DATA_ATTRIBUTES.size +
-                TestoClasses.TEST_INLINE_ATTRIBUTES.size +
-                TestoClasses.BENCH_ATTRIBUTES.size
-        assertEquals(expectedGrouped, totalGrouped)
-    }
 }

src/test/kotlin/com/github/xepozz/testo/TestoLineMarkerCompanionTest.kt

@@ -24,11 +24,9 @@ class TestoLineMarkerCompanionTest : TestCase() {
         assertTrue("Should contain \\Testo\\Bench", runnable.contains(TestoClasses.BENCH))
     }
 
-    fun testRunnableAttributes_containsTestInlineAttributes() {
+    fun testRunnableAttributes_containsTestInline() {
         val runnable = TestoTestRunLineMarkerProvider.RUNNABLE_ATTRIBUTES.toSet()
-        for (attr in TestoClasses.TEST_INLINE_ATTRIBUTES) {
-            assertTrue("Missing test inline attribute: $attr", runnable.contains(attr))
-        }
+        assertTrue("Missing TestInline attribute", runnable.contains(TestoClasses.TEST_INLINE))
     }
 
     fun testRunnableAttributes_doesNotContainPlainTestAttribute() {
@@ -38,8 +36,8 @@ class TestoLineMarkerCompanionTest : TestCase() {
 
     fun testRunnableAttributes_totalCount() {
         val expected = TestoClasses.DATA_ATTRIBUTES.size +
-                TestoClasses.TEST_INLINE_ATTRIBUTES.size +
-                TestoClasses.BENCH_ATTRIBUTES.size
+                TestoClasses.BENCH_ATTRIBUTES.size +
+                1 // TestInline
         assertEquals(expected, TestoTestRunLineMarkerProvider.RUNNABLE_ATTRIBUTES.size)
     }
 }