fix: location for anything other than a step was wrong

See #404

Author: gaeljw

cucumber-scala/src/main/scala/io/cucumber/scala/AbstractGlueDefinition.scala

@@ -15,7 +15,7 @@ trait AbstractGlueDefinition extends Located {
 
   val location: StackTraceElement
 
-  lazy val sourceReference: SourceReference =
+  private lazy val sourceReference: SourceReference =
     SourceReference.fromStackTraceElement(location)
 
   override def getLocation(): String = {

cucumber-scala/src/main/scala/io/cucumber/scala/DataTableTypeDsl.scala

@@ -2,7 +2,7 @@ package io.cucumber.scala
 
 import scala.reflect.ClassTag
 
-private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
+private[scala] trait DataTableTypeDsl extends BaseScalaDsl { self =>
 
   /** Register a data table type.
     */
@@ -27,7 +27,12 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         body: DataTableEntryDefinitionBody[T]
     )(implicit ev: ClassTag[T]): Unit = {
       registry.registerDataTableType(
-        ScalaDataTableEntryTypeDetails[T](replaceWithEmptyString, body, ev)
+        ScalaDataTableEntryTypeDetails[T](
+          replaceWithEmptyString,
+          body,
+          ev,
+          Utils.frame(self)
+        )
       )
     }
 
@@ -38,7 +43,8 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         ScalaDataTableOptionalEntryTypeDetails[T](
           replaceWithEmptyString,
           body,
-          ev
+          ev,
+          Utils.frame(self)
         )
       )
     }
@@ -47,7 +53,12 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         body: DataTableRowDefinitionBody[T]
     )(implicit ev: ClassTag[T]): Unit = {
       registry.registerDataTableType(
-        ScalaDataTableRowTypeDetails[T](replaceWithEmptyString, body, ev)
+        ScalaDataTableRowTypeDetails[T](
+          replaceWithEmptyString,
+          body,
+          ev,
+          Utils.frame(self)
+        )
       )
     }
 
@@ -58,7 +69,8 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         ScalaDataTableOptionalRowTypeDetails[T](
           replaceWithEmptyString,
           body,
-          ev
+          ev,
+          Utils.frame(self)
         )
       )
     }
@@ -67,7 +79,12 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         body: DataTableCellDefinitionBody[T]
     )(implicit ev: ClassTag[T]): Unit = {
       registry.registerDataTableType(
-        ScalaDataTableCellTypeDetails[T](replaceWithEmptyString, body, ev)
+        ScalaDataTableCellTypeDetails[T](
+          replaceWithEmptyString,
+          body,
+          ev,
+          Utils.frame(self)
+        )
       )
     }
 
@@ -78,7 +95,8 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         ScalaDataTableOptionalCellTypeDetails[T](
           replaceWithEmptyString,
           body,
-          ev
+          ev,
+          Utils.frame(self)
         )
       )
     }
@@ -87,7 +105,12 @@ private[scala] trait DataTableTypeDsl extends BaseScalaDsl {
         body: DataTableDefinitionBody[T]
     )(implicit ev: ClassTag[T]): Unit = {
       registry.registerDataTableType(
-        ScalaDataTableTableTypeDetails[T](replaceWithEmptyString, body, ev)
+        ScalaDataTableTableTypeDetails[T](
+          replaceWithEmptyString,
+          body,
+          ev,
+          Utils.frame(self)
+        )
       )
     }
 

cucumber-scala/src/main/scala/io/cucumber/scala/DefaultTransformerDsl.scala

@@ -6,7 +6,7 @@ import io.cucumber.scala.Aliases.{
   DefaultParameterTransformerBody
 }
 
-private[scala] trait DefaultTransformerDsl extends BaseScalaDsl {
+private[scala] trait DefaultTransformerDsl extends BaseScalaDsl { self =>
 
   /** Register default parameter type transformer.
     *
@@ -17,7 +17,7 @@ private[scala] trait DefaultTransformerDsl extends BaseScalaDsl {
       body: DefaultParameterTransformerBody
   ): Unit = {
     registry.registerDefaultParameterTransformer(
-      ScalaDefaultParameterTransformerDetails(body)
+      ScalaDefaultParameterTransformerDetails(body, Utils.frame(self))
     )
   }
 
@@ -52,7 +52,11 @@ private[scala] trait DefaultTransformerDsl extends BaseScalaDsl {
       replaceWithEmptyString: Seq[String]
   )(body: DefaultDataTableCellTransformerBody): Unit = {
     registry.registerDefaultDataTableCellTransformer(
-      ScalaDefaultDataTableCellTransformerDetails(replaceWithEmptyString, body)
+      ScalaDefaultDataTableCellTransformerDetails(
+        replaceWithEmptyString,
+        body,
+        Utils.frame(self)
+      )
     )
   }
 
@@ -89,7 +93,11 @@ private[scala] trait DefaultTransformerDsl extends BaseScalaDsl {
       replaceWithEmptyString: Seq[String]
   )(body: DefaultDataTableEntryTransformerBody): Unit = {
     registry.registerDefaultDataTableEntryTransformer(
-      ScalaDefaultDataTableEntryTransformerDetails(replaceWithEmptyString, body)
+      ScalaDefaultDataTableEntryTransformerDetails(
+        replaceWithEmptyString,
+        body,
+        Utils.frame(self)
+      )
     )
   }
 

cucumber-scala/src/main/scala/io/cucumber/scala/DocStringTypeDsl.scala

@@ -2,7 +2,7 @@ package io.cucumber.scala
 
 import io.cucumber.scala.Aliases.DocStringDefinitionBody
 
-private[scala] trait DocStringTypeDsl extends BaseScalaDsl {
+private[scala] trait DocStringTypeDsl extends BaseScalaDsl { self =>
 
   /** Register doc string type.
     *
@@ -18,7 +18,12 @@ private[scala] trait DocStringTypeDsl extends BaseScalaDsl {
       contentType: String
   )(body: DocStringDefinitionBody[T])(implicit ev: Stepable[T]): Unit = {
     registry.registerDocStringType(
-      ScalaDocStringTypeDetails[T](contentType, body, ev.asJavaType)
+      ScalaDocStringTypeDetails[T](
+        contentType,
+        body,
+        ev.asJavaType,
+        Utils.frame(self)
+      )
     )
   }
 

cucumber-scala/src/main/scala/io/cucumber/scala/ParameterTypeDsl.scala

@@ -2,7 +2,7 @@ package io.cucumber.scala
 
 import scala.reflect.ClassTag
 
-private[scala] trait ParameterTypeDsl extends BaseScalaDsl {
+private[scala] trait ParameterTypeDsl extends BaseScalaDsl { self =>
 
   /** Register parameter type.
     *
@@ -748,7 +748,7 @@ private[scala] trait ParameterTypeDsl extends BaseScalaDsl {
         pf: PartialFunction[List[String], R]
     )(implicit tag: ClassTag[R]): Unit = {
       registry.registerParameterType(
-        ScalaParameterTypeDetails[R](name, regex, pf, tag)
+        ScalaParameterTypeDetails[R](name, regex, pf, tag, Utils.frame(self))
       )
     }
 

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableCellDefinition.scala

@@ -7,11 +7,7 @@ import scala.annotation.nowarn
 
 trait ScalaDataTableCellDefinition[T] extends ScalaDataTableTypeDefinition {
 
-  val details: ScalaDataTableCellTypeDetails[T]
-
-  override val emptyPatterns: Seq[String] = details.emptyPatterns
-
-  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+  override val details: ScalaDataTableCellTypeDetails[T]
 
   private val transformer: TableCellTransformer[T] = (cell: String) => {
     details.body.transform(replaceEmptyPatternsWithEmptyString(cell))

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableDefinition.scala

@@ -7,11 +7,7 @@ import scala.annotation.nowarn
 
 trait ScalaDataTableDefinition[T] extends ScalaDataTableTypeDefinition {
 
-  val details: ScalaDataTableTableTypeDetails[T]
-
-  override val emptyPatterns: Seq[String] = details.emptyPatterns
-
-  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+  override val details: ScalaDataTableTableTypeDetails[T]
 
   private val transformer: TableTransformer[T] = (table: DataTable) => {
     details.body.transform(replaceEmptyPatternsWithEmptyString(table))

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableEntryDefinition.scala

@@ -9,11 +9,7 @@ import scala.jdk.CollectionConverters._
 
 trait ScalaDataTableEntryDefinition[T] extends ScalaDataTableTypeDefinition {
 
-  val details: ScalaDataTableEntryTypeDetails[T]
-
-  override val emptyPatterns: Seq[String] = details.emptyPatterns
-
-  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+  override val details: ScalaDataTableEntryTypeDetails[T]
 
   private val transformer: TableEntryTransformer[T] =
     (entry: JavaMap[String, String]) => {

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalCellDefinition.scala

@@ -8,11 +8,7 @@ import scala.annotation.nowarn
 trait ScalaDataTableOptionalCellDefinition[T]
     extends ScalaDataTableTypeDefinition {
 
-  val details: ScalaDataTableOptionalCellTypeDetails[T]
-
-  override val emptyPatterns: Seq[String] = details.emptyPatterns
-
-  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+  override val details: ScalaDataTableOptionalCellTypeDetails[T]
 
   private val transformer: TableCellTransformer[T] = (cell: String) => {
     details.body.transform(Option(replaceEmptyPatternsWithEmptyString(cell)))

cucumber-scala/src/main/scala/io/cucumber/scala/ScalaDataTableOptionalEntryDefinition.scala

@@ -10,11 +10,7 @@ import scala.jdk.CollectionConverters._
 trait ScalaDataTableOptionalEntryDefinition[T]
     extends ScalaDataTableTypeDefinition {
 
-  val details: ScalaDataTableOptionalEntryTypeDetails[T]
-
-  override val emptyPatterns: Seq[String] = details.emptyPatterns
-
-  override val location: StackTraceElement = new Exception().getStackTrace()(3)
+  override val details: ScalaDataTableOptionalEntryTypeDetails[T]
 
   private val transformer: TableEntryTransformer[T] =
     (entry: JavaMap[String, String]) => {