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

Author: xepozz

CLAUDE.md

@@ -158,21 +158,17 @@ Attributes on a function/method are numbered **within their own group**, not glo
 
 | Group             | Source array              | Used for                                      |
 |-------------------|---------------------------|-----------------------------------------------|
-| test data         | `DATA_ATTRIBUTES`         | Data providers for `#[Test]` methods          |
+| test + data       | `TEST_DATA_ATTRIBUTES`    | `#[Test]` + data providers, numbered together |
 | inline            | `TEST_INLINE_ATTRIBUTES`  | Inline test cases (`#[TestInline]`)           |
 | bench             | `BENCH_ATTRIBUTES`        | Benchmark data (`#[Bench]`)                   |
 
-The `#[Test]` attribute itself is **not numbered** — it is a marker only. The method/function name already gets its own gutter line marker. `Test` IS included in `RUNNABLE_ATTRIBUTES` (it's runnable), but `getAttributeOrder` returns `-1` for it, and the line marker falls back to `getLocationInfo`.
-
-The `#[Test]` attribute itself is **not numbered** — it is a marker only. The method/function name already gets its own gutter line marker.
-
 Example for a function `foo` with multiple attributes:
 ```
-#[Test]                 → type=test (no index, marker only)
-#[DataProvider(...)]    → type=test, foo:0
-#[DataSet([...])]       → type=test, foo:1
-#[DataZip(...)]         → type=test, foo:2
-#[DataCross(...)]       → type=test, foo:3
+#[Test]                 → type=test, foo:0
+#[DataProvider(...)]    → type=test, foo:1
+#[DataSet([...])]       → type=test, foo:2
+#[DataZip(...)]         → type=test, foo:3
+#[DataCross(...)]       → type=test, foo:4
 #[TestInline(...)]      → type=inline, foo:0
 #[TestInline(...)]      → type=inline, foo:1
 #[TestInline(...)]      → type=inline, foo:2

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

@@ -33,6 +33,10 @@ object TestoClasses {
     val TEST_INLINE_ATTRIBUTES = arrayOf(
         TEST_INLINE,
     )
+    val TEST_DATA_ATTRIBUTES = arrayOf(
+        TEST,
+        *DATA_ATTRIBUTES,
+    )
     val BENCH_ATTRIBUTES = arrayOf(
         BENCH,
     )

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

@@ -14,7 +14,7 @@ object PsiUtil {
     )
 
     val ATTRIBUTE_GROUPS: Array<Array<String>> = arrayOf(
-        TestoClasses.DATA_ATTRIBUTES,
+        TestoClasses.TEST_DATA_ATTRIBUTES,
         TestoClasses.TEST_INLINE_ATTRIBUTES,
         TestoClasses.BENCH_ATTRIBUTES,
     )

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

@@ -33,29 +33,34 @@ class PsiUtilTest : TestCase() {
 
     // --- Attribute group tests ---
 
-    fun testGetAttributeGroup_dataProviderInDataGroup() {
+    fun testGetAttributeGroup_testInTestDataGroup() {
+        val group = PsiUtil.getAttributeGroup(TestoClasses.TEST)
+        assertSame(TestoClasses.TEST_DATA_ATTRIBUTES, group)
+    }
+
+    fun testGetAttributeGroup_dataProviderInTestDataGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.DATA_PROVIDER)
-        assertSame(TestoClasses.DATA_ATTRIBUTES, group)
+        assertSame(TestoClasses.TEST_DATA_ATTRIBUTES, group)
     }
 
-    fun testGetAttributeGroup_dataSetInDataGroup() {
+    fun testGetAttributeGroup_dataSetInTestDataGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.DATA_SET)
-        assertSame(TestoClasses.DATA_ATTRIBUTES, group)
+        assertSame(TestoClasses.TEST_DATA_ATTRIBUTES, group)
     }
 
-    fun testGetAttributeGroup_dataUnionInDataGroup() {
+    fun testGetAttributeGroup_dataUnionInTestDataGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.DATA_UNION)
-        assertSame(TestoClasses.DATA_ATTRIBUTES, group)
+        assertSame(TestoClasses.TEST_DATA_ATTRIBUTES, group)
     }
 
-    fun testGetAttributeGroup_dataCrossInDataGroup() {
+    fun testGetAttributeGroup_dataCrossInTestDataGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.DATA_CROSS)
-        assertSame(TestoClasses.DATA_ATTRIBUTES, group)
+        assertSame(TestoClasses.TEST_DATA_ATTRIBUTES, group)
     }
 
-    fun testGetAttributeGroup_dataZipInDataGroup() {
+    fun testGetAttributeGroup_dataZipInTestDataGroup() {
         val group = PsiUtil.getAttributeGroup(TestoClasses.DATA_ZIP)
-        assertSame(TestoClasses.DATA_ATTRIBUTES, group)
+        assertSame(TestoClasses.TEST_DATA_ATTRIBUTES, group)
     }
 
     fun testGetAttributeGroup_testInlineInInlineGroup() {
@@ -68,11 +73,6 @@ class PsiUtilTest : TestCase() {
         assertSame(TestoClasses.BENCH_ATTRIBUTES, group)
     }
 
-    fun testGetAttributeGroup_testHasNoGroup() {
-        val group = PsiUtil.getAttributeGroup(TestoClasses.TEST)
-        assertNull("Test attribute is a marker, not numbered", group)
-    }
-
     fun testGetAttributeGroup_nullReturnsNull() {
         assertNull(PsiUtil.getAttributeGroup(null))
     }
@@ -102,9 +102,18 @@ class PsiUtilTest : TestCase() {
 
     fun testAttributeGroups_totalCount() {
         val totalGrouped = PsiUtil.ATTRIBUTE_GROUPS.sumOf { it.size }
-        val expectedGrouped = TestoClasses.DATA_ATTRIBUTES.size +
+        val expectedGrouped = TestoClasses.TEST_DATA_ATTRIBUTES.size +
                 TestoClasses.TEST_INLINE_ATTRIBUTES.size +
                 TestoClasses.BENCH_ATTRIBUTES.size
         assertEquals(expectedGrouped, totalGrouped)
     }
+
+    fun testTestDataAttributes_containsTestAndAllData() {
+        val testData = TestoClasses.TEST_DATA_ATTRIBUTES.toSet()
+        assertTrue(testData.contains(TestoClasses.TEST))
+        for (attr in TestoClasses.DATA_ATTRIBUTES) {
+            assertTrue("Missing: $attr", testData.contains(attr))
+        }
+        assertEquals(1 + TestoClasses.DATA_ATTRIBUTES.size, TestoClasses.TEST_DATA_ATTRIBUTES.size)
+    }
 }