gopls/internal/test/marker: fix reachable panic("unreachable")

adonovan · adonovan · commit 4faf573319c9 · 2025-07-22T08:02:43.000-07:00
Instead, report an informative error. (Found while investigating golang/go#61496.) Updates golang/go#61496 Change-Id: I242603fcd598b1fd119bb22c7995cb6b978543ab Reviewed-on: https://go-review.googlesource.com/c/tools/+/689475 Reviewed-by: Madeline Kalil <mkalil@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/gopls/internal/test/marker/marker_test.go b/gopls/internal/test/marker/marker_test.go
@@ -2142,7 +2142,8 @@ func codeActionMarker(mark marker, loc protocol.Location, kind string) {
 
 	if end := namedArgFunc(mark, "end", convertNamedArgLocation, protocol.Location{}); end.URI != "" {
 		if end.URI != loc.URI {
-			panic("unreachable")
+			mark.errorf("end marker is in a different file (%s)", filepath.Base(loc.URI.Path()))
+			return
 		}
 		loc.Range.End = end.Range.End
 	}

Original file line number	Diff line number	Diff line change
`@@ -2142,7 +2142,8 @@ func codeActionMarker(mark marker, loc protocol.Location, kind string) {`
`2142`	`2142`
`2143`	`2143`	`if end := namedArgFunc(mark, "end", convertNamedArgLocation, protocol.Location{}); end.URI != "" {`
`2144`	`2144`	`if end.URI != loc.URI {`
`2145`		`- panic("unreachable")`
	`2145`	`+ mark.errorf("end marker is in a different file (%s)", filepath.Base(loc.URI.Path()))`
	`2146`	`+ return`
`2146`	`2147`	`}`
`2147`	`2148`	`loc.Range.End = end.Range.End`
`2148`	`2149`	`}`