Merge pull request #70 from vbmacher/step-creation

[#69] Fix resolving steps using cucumber-parameters "regexes"

Author: vbmacher

cucumber-scala/src/main/scala/com/github/danielwegener/intellij/cucumber/scala/steps/ScStepDefinition.scala

@@ -13,6 +13,23 @@ import scala.collection.JavaConverters._
 import scala.util.Try
 
 class ScStepDefinition(scMethod: ScMethodCall) extends AbstractStepDefinition(scMethod.getFirstChild) {
+  private val INTEGER_REGEXP = "-?\\\\d+"
+  private val FLOAT_REGEXP = "[+-]?(\\\\d+\\\\.)?\\\\d+"
+  private val WORD_REGEXP = "\\\\w"
+
+  // See: io.cucumber.cucumberexpressions.ParameterTypeRegistry
+  private val paramRegexp = Map(
+    "\\{biginteger\\}" -> INTEGER_REGEXP,
+    "\\{int\\}" -> INTEGER_REGEXP,
+    "\\{byte\\}" -> INTEGER_REGEXP,
+    "\\{short\\}" -> INTEGER_REGEXP,
+    "\\{long\\}" -> INTEGER_REGEXP,
+    "\\{bigdecimal\\}" -> FLOAT_REGEXP,
+    "\\{float\\}" -> FLOAT_REGEXP,
+    "\\{double\\}" -> FLOAT_REGEXP,
+    "\\{word\\}" -> WORD_REGEXP,
+    "\\{string\\}" -> "(.*)"
+  ).mapValues("(" + _ + ")")
 
   override def getVariableNames: util.List[String] = {
     seqAsJavaList(ScCucumberUtil.getStepArguments(scMethod).map(_.getName()))
@@ -21,11 +38,16 @@ class ScStepDefinition(scMethod: ScMethodCall) extends AbstractStepDefinition(sc
   @Nullable
   override def getCucumberRegexFromElement(element: PsiElement): String = Try {
     scMethod match {
-      case mc: ScMethodCall => ScCucumberUtil.getStepRegex(mc).orNull
+      case mc: ScMethodCall => ScCucumberUtil.getStepRegex(mc).map(replaceParametersWithRegex).orNull
       case _ => null
     }
   }.getOrElse(null)
 
+  def replaceParametersWithRegex(regex: String): String = {
+    paramRegexp.foldLeft(regex) {
+      case (acc, (key, replacement)) => acc.replaceAll(key, replacement)
+    }
+  }
 }
 
 object ScStepDefinition {

cucumber-scala/src/test/resources/testdata/resolveDirect/StepDefinitions.scala

@@ -26,6 +26,10 @@ class StepDefinitions extends ScalaDsl {
 
   }
 
+  And("Some {int} parameter with {float}") {
+
+  }
+
   Then("^the result is ([+-]?\\d+)$") { expected: Double =>
     assertEquals(expected, calc.value, 0.001)
   }

cucumber-scala/src/test/resources/testdata/resolveDirect/testcase.feature

@@ -12,3 +12,4 @@ Feature: Basic Arithmetic
     When I div 10 by 2
     Then the result is 5
     And nothing else
+    And Some 55 parameter with 3.14

cucumber-scala/src/test/scala/com/github/danielwegener/intellij/cucumber/scala/resolve/StepResolveSpec.scala

@@ -29,6 +29,11 @@ class StepResolveSpec extends StepResolveSpecBase {
     checkResolveIndirect("When I div 10 by 2")
   }
 
+  @Test
+  def testResolveDirectWithCucumberParameters(): Unit = {
+    checkResolveDirect("Some 55 parameter with 3.14")
+  }
+
   @Test
   def testResolveMultipleDefinitions(): Unit = {
     multiResolve(2,