add support for FreeSpec

Author: alfonsoristorato

src/main/kotlin/io/kotest/plugin/intellij/styles/FreeSpecStyle.kt

@@ -12,6 +12,7 @@ import io.kotest.plugin.intellij.psi.extractStringLiteralFromLhsOfInfixFunction
 import io.kotest.plugin.intellij.psi.ifMinusOperator
 import io.kotest.plugin.intellij.psi.ifCallExpressionLhsStringOpenQuote
 import io.kotest.plugin.intellij.psi.ifDotExpressionSeparator
+import io.kotest.plugin.intellij.psi.isDataTestMethodCall
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtCallExpression
@@ -28,6 +29,11 @@ object FreeSpecStyle : SpecStyle {
       return "\"$name\" { }"
    }
 
+   override fun getDataTestMethodNames(): Set<String> =
+      setOf(
+         "withData"
+      )
+
    override fun isTestElement(element: PsiElement): Boolean = test(element) != null
 
    private fun locateParent(element: PsiElement): Test? {
@@ -79,7 +85,7 @@ object FreeSpecStyle : SpecStyle {
 
    override fun test(element: PsiElement): Test? {
       return when (element) {
-         is KtCallExpression -> element.tryTest()
+         is KtCallExpression -> element.tryTest() ?: element.tryDataTest()
          is KtDotQualifiedExpression -> element.tryTestWithConfig()
          is KtBinaryExpression -> element.tryContainer()
          else -> null
@@ -95,6 +101,7 @@ object FreeSpecStyle : SpecStyle {
     *
     * "test name" {} // a test
     * "test name" - {} // a container
+    * withData(...) { }
     */
    override fun test(element: LeafPsiElement): Test? {
       val ktcall = element.ifCallExpressionLhsStringOpenQuote()
@@ -106,6 +113,12 @@ object FreeSpecStyle : SpecStyle {
       val ktbinary = element.ifMinusOperator()
       if (ktbinary != null) return test(ktbinary)
 
+      // try to find Data Test Method by finding lambda openings
+      val dataMethodCall = element.isDataTestMethodCall(getDataTestMethodNames())
+      if (dataMethodCall != null) {
+         return test(dataMethodCall)
+      }
+
       return null
    }
 }

src/test/kotlin/io/kotest/plugin/intellij/styles/FreeSpecRunMarkerTest.kt

@@ -24,39 +24,43 @@ class FreeSpecRunMarkerTest : LightJavaCodeInsightFixtureTestCase() {
 
       val gutters = myFixture.findAllGutters()
       println(gutters.map { it.tooltipText }.joinToString("\n"))
-      gutters.size shouldBe 8
+      gutters.size shouldBe 9
 
       gutters[0].icon shouldBe AllIcons.RunConfigurations.TestState.Run_run
       gutters[0].tooltipText shouldBe "Run FreeSpecExample"
-      (gutters[0] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 87
+      (gutters[0] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 122
 
       gutters[1].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[1].tooltipText shouldBe "Run some context"
-      (gutters[1] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 152
+      (gutters[1] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 187
 
       gutters[2].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[2].tooltipText shouldBe "Run some context more context"
-      (gutters[2] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 177
+      (gutters[2] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 212
 
       gutters[3].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[3].tooltipText shouldBe "Run some context more context as many as you want"
-      (gutters[3] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 211
+      (gutters[3] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 246
 
       gutters[4].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[4].tooltipText shouldBe "Run some context more context as many as you want then a test"
-      (gutters[4] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 225
+      (gutters[4] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 260
 
       gutters[5].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[5].tooltipText shouldBe "Run another context"
-      (gutters[5] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 324
+      (gutters[5] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 359
 
       gutters[6].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[6].tooltipText shouldBe "Run another context a test with config"
-      (gutters[6] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 354
+      (gutters[6] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 389
 
       gutters[7].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[7].tooltipText shouldBe "Run a test without a context block"
-      (gutters[7] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 399
+      (gutters[7] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 434
+
+      gutters[8].icon shouldBe AllIcons.RunConfigurations.TestState.Run
+      gutters[8].tooltipText shouldBe "Run All Spec Tests, including data tests"
+      (gutters[8] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 505
    }
 
    fun testMethodGeneration() {

src/test/resources/freespec.kt

@@ -1,6 +1,7 @@
 package com.sksamuel.kotest.specs.freespec
 
 import io.kotest.core.spec.style.FreeSpec
+import io.kotest.datatest.withData
 
 class FreeSpecExample : FreeSpec() {
   init {
@@ -20,5 +21,9 @@ class FreeSpecExample : FreeSpec() {
     }
     "a test without a context block" {
     }
+
+     withData(1, 2, 3, 4, 5) { value ->
+        // test here
+     }
   }
-}
+}