add support for ExpectSpec

Author: alfonsoristorato

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

@@ -10,6 +10,7 @@ import io.kotest.plugin.intellij.psi.extractLhsStringArgForDotExpressionWithRhsF
 import io.kotest.plugin.intellij.psi.extractStringArgForFunctionWithStringAndLambdaArgs
 import io.kotest.plugin.intellij.psi.ifCallExpressionLambdaOpenBrace
 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.KtCallExpression
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -25,6 +26,13 @@ object ExpectSpecStyle : SpecStyle {
       return "expect(\"$name\") { }"
    }
 
+   override fun getDataTestMethodNames(): Set<String> =
+      setOf(
+         "withData",
+         "withContexts",
+         "withExpects"
+      )
+
    override fun isTestElement(element: PsiElement): Boolean = test(element) != null
 
    private fun locateParent(element: PsiElement): Test? {
@@ -60,7 +68,7 @@ object ExpectSpecStyle : SpecStyle {
 
    override fun test(element: PsiElement): Test? {
       return when (element) {
-         is KtCallExpression -> element.tryExpect() ?: element.tryContext()
+         is KtCallExpression -> element.tryExpect() ?: element.tryContext() ?: element.tryDataTest()
          is KtDotQualifiedExpression -> element.tryExpectWithConfig()
          else -> null
       }
@@ -70,13 +78,30 @@ object ExpectSpecStyle : SpecStyle {
       return setOf("OPEN_QUOTE")
    }
 
+   /**
+    * For a ExpectSpec we consider the following scenarios:
+    *
+    * expect("test name") { }
+    * expect("test name").config(...) {}
+    * context("test name") {}
+    * context("test name").config(...) {}
+    * withData(...) { }
+    * withContexts(...) { }
+    * withExpects(...) { }
+    */
    override fun test(element: LeafPsiElement): Test? {
       val ktcall = element.ifCallExpressionLambdaOpenBrace()
       if (ktcall != null) return test(ktcall)
 
       val ktdot = element.ifDotExpressionSeparator()
       if (ktdot != null) return test(ktdot)
 
+      // 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/ExpectSpecStyleTest.kt

@@ -6,6 +6,7 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
 import io.kotest.matchers.shouldBe
 import io.kotest.plugin.intellij.testMode
 import java.nio.file.Paths
+import kotlin.collections.get
 
 class ExpectSpecStyleTest : LightJavaCodeInsightFixtureTestCase() {
 
@@ -23,34 +24,38 @@ class ExpectSpecStyleTest : LightJavaCodeInsightFixtureTestCase() {
       )
 
       val gutters = myFixture.findAllGutters()
-      gutters.size shouldBe 7
+      gutters.size shouldBe 8
 
       gutters[0].icon shouldBe AllIcons.RunConfigurations.TestState.Run_run
       gutters[0].tooltipText shouldBe "Run ExpectSpecExample"
-      (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 165
+      (gutters[1] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 200
 
       gutters[2].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[2].tooltipText shouldBe "Run some context some test"
-      (gutters[2] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 193
+      (gutters[2] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 228
 
       gutters[3].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[3].tooltipText shouldBe "Run some context some test with config"
-      (gutters[3] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 261
+      (gutters[3] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 296
 
       gutters[4].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[4].tooltipText shouldBe "Run some context another nested context"
-      (gutters[4] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 357
+      (gutters[4] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 392
 
       gutters[5].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[5].tooltipText shouldBe "Run some context another nested context some test"
-      (gutters[5] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 387
+      (gutters[5] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 422
 
       gutters[6].icon shouldBe AllIcons.RunConfigurations.TestState.Run
       gutters[6].tooltipText shouldBe "Run some context another nested context some test with config"
-      (gutters[6] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 461
+      (gutters[6] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 496
+
+      gutters[7].icon shouldBe AllIcons.RunConfigurations.TestState.Run
+      gutters[7].tooltipText shouldBe "Run All Spec Tests, including data tests"
+      (gutters[7] as LineMarkerInfo.LineMarkerGutterIconRenderer<*>).lineMarkerInfo.startOffset shouldBe 599
    }
 }

src/test/resources/expectspec.kt

@@ -1,6 +1,7 @@
 package com.sksamuel.kotest.specs.expect
 
 import io.kotest.core.spec.style.ExpectSpec
+import io.kotest.datatest.withData
 
 class ExpectSpecExample : ExpectSpec() {
   init {
@@ -20,5 +21,9 @@ class ExpectSpecExample : ExpectSpec() {
         }
       }
     }
+
+    withData(1, 2, 3, 4, 5) { value ->
+      // test here
+    }
   }
 }