feat: improve position for closure

kkHAIKE · Mar 21, 2024 · 3cc6ce5 · 3cc6ce5
1 parent 7fdfd4d
commit 3cc6ce5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/contextcheck.go b/contextcheck.go
@@ -589,6 +589,22 @@ func (r *runner) checkFuncWithCtx(f *ssa.Function, tp entryType) {
 
 func (r *runner) Reportf(instr ssa.Instruction, format string, args ...interface{}) {
 	pos := instr.Pos()
+
+	if !pos.IsValid() && instr.Block() != nil {
+		if closure, ok := instr.(*ssa.MakeClosure); ok {
+			for _, in := range closure.Block().Instrs {
+				if !in.Pos().IsValid() {
+					continue
+				}
+
+				if r, ok := in.(*ssa.Return); ok {
+					pos = r.Pos()
+					break
+				}
+			}
+		}
+	}
+
 	if !pos.IsValid() && instr.Parent() != nil {
 		pos = instr.Parent().Pos()
 	}

diff --git a/testdata/src/a/a.go b/testdata/src/a/a.go
@@ -158,8 +158,8 @@ func f13[T int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 |
 
 /* ----------------- issue 21 ----------------- */
 
-func f16(ctx context.Context, k string) func() { // want "Function `f16\\$1` should pass the context parameter"
-	return func() {
+func f16(ctx context.Context, k string) func() {
+	return func() { // want "Function `f16\\$1` should pass the context parameter"
 		f16(context.Background(), k)
 	}
 }