Print step declaration line instead of handler declaration line (#668)

* Print step declaration line instead of handler declaration line.

* Update changelog.

Author: SpencerC

CHANGELOG.md

@@ -17,6 +17,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 ### Fixed
 - fix(errors): fix(errors): Fix expected Step argument count for steps with `context.Context` ([679](https://github.com/cucumber/godog/pull/679) - [tigh-latte](https://github.com/tigh-latte))
 - fix(formatter): On concurrent execution, execute formatter at end of Scenario - ([645](https://github.com/cucumber/godog/pull/645) - [tigh-latte](https://github.com/tigh-latte))
+- Pretty printing results now prints the line where the step is declared instead of the line where the handler is declared. ([668](https://github.com/cucumber/godog/pull/668) - [spencerc](https://github.com/SpencerC))
 
 ## [v0.15.0]
 

internal/formatters/fmt.go

@@ -78,9 +78,7 @@ func mustConvertStringToInt(s string) int {
 func DefinitionID(sd *models.StepDefinition) string {
 	ptr := sd.HandlerValue.Pointer()
 	f := runtime.FuncForPC(ptr)
-	file, line := f.FileLine(ptr)
-	dir := filepath.Dir(file)
-
+	dir := filepath.Dir(sd.File)
 	fn := strings.Replace(f.Name(), dir, "", -1)
 	var parts []string
 	for _, gr := range matchFuncDefRef.FindAllStringSubmatch(fn, -1) {
@@ -100,7 +98,7 @@ func DefinitionID(sd *models.StepDefinition) string {
 		fn = strings.Replace(fn, "..", ".", -1)
 	}
 
-	return fmt.Sprintf("%s:%d -> %s", filepath.Base(file), line, fn)
+	return fmt.Sprintf("%s:%d -> %s", filepath.Base(sd.File), sd.Line, fn)
 }
 
 var matchFuncDefRef = regexp.MustCompile(`\(([^\)]+)\)`)

internal/models/stepdef.go

@@ -27,6 +27,8 @@ type StepDefinition struct {
 
 	Args         []interface{}
 	HandlerValue reflect.Value
+	File         string
+	Line         int
 
 	// multistep related
 	Nested    bool

suite.go

@@ -260,6 +260,8 @@ func (s *suite) runStep(ctx context.Context, pickle *Scenario, step *Step, scena
 				},
 				Args:         match.Args,
 				HandlerValue: match.HandlerValue,
+				File:         match.File,
+				Line:         match.Line,
 				Nested:       match.Nested,
 				Undefined:    undef,
 			}
@@ -532,6 +534,8 @@ func (s *suite) matchStepTextAndType(text string, stepType messages.PickleStepTy
 				},
 				Args:         args,
 				HandlerValue: h.HandlerValue,
+				File:         h.File,
+				Line:         h.Line,
 				Nested:       h.Nested,
 			}
 

test_context.go

@@ -5,12 +5,14 @@ import (
 	"fmt"
 	"reflect"
 	"regexp"
+	"runtime"
+
+	messages "github.com/cucumber/messages/go/v21"
 
 	"github.com/cucumber/godog/formatters"
 	"github.com/cucumber/godog/internal/builder"
 	"github.com/cucumber/godog/internal/flags"
 	"github.com/cucumber/godog/internal/models"
-	messages "github.com/cucumber/messages/go/v21"
 )
 
 // GherkinDocument represents gherkin document.
@@ -342,6 +344,10 @@ func (ctx ScenarioContext) stepWithKeyword(expr interface{}, stepFunc interface{
 		Nested:       isNested,
 	}
 
+	// Get the file and line number of the call that created this step with a
+	// call to one of the Step, Given, When, or Then wrappers.
+	_, def.File, def.Line, _ = runtime.Caller(2)
+
 	// stash the step
 	ctx.suite.steps = append(ctx.suite.steps, def)
 }