From ef85672e9882df67b1546fa86526e5636f8ff2cf Mon Sep 17 00:00:00 2001
From: Rob Findley <rfindley@google.com>
Date: Wed, 8 Nov 2023 19:46:56 -0500
Subject: [PATCH] gopls/internal/regtest/marker: trim redundant header from
 golden diffs

The unified header adds no value for these diffs. Trim for brevity and
readability (in particular because the header clashes visually with the
txtar file header).

For golang/go#54845

Change-Id: I88223529c5520f82e6751b98aae0c1c4291b56c2
Reviewed-on: https://go-review.googlesource.com/c/tools/+/539664
Reviewed-by: Alan Donovan <adonovan@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
---
 gopls/internal/lsp/regtest/marker.go          |  8 ++-
 .../testdata/codeaction/extract_method.txt    | 32 ---------
 .../testdata/codeaction/extract_variable.txt  | 12 ----
 .../testdata/codeaction/fill_struct.txt       | 68 -------------------
 .../marker/testdata/codeaction/invertif.txt   | 22 ------
 .../marker/testdata/diagnostics/typeerr.txt   |  2 -
 .../regtest/marker/testdata/rename/basic.txt  |  4 --
 .../regtest/marker/testdata/rename/embed.txt  |  4 --
 .../marker/testdata/rename/generics.txt       | 22 ------
 .../marker/testdata/rename/issue43616.txt     |  2 -
 .../marker/testdata/rename/issue60789.txt     |  2 -
 .../marker/testdata/rename/issue61294.txt     |  2 -
 .../marker/testdata/rename/issue61640.txt     |  2 -
 .../marker/testdata/rename/issue61813.txt     |  2 -
 .../marker/testdata/rename/methods.txt        |  4 --
 .../marker/testdata/rename/typeswitch.txt     |  2 -
 .../marker/testdata/stubmethods/basic.txt     |  2 -
 .../testdata/stubmethods/issue61693.txt       |  2 -
 .../testdata/stubmethods/issue61830.txt       |  2 -
 .../testdata/suggestedfix/embeddirective.txt  |  2 -
 .../testdata/suggestedfix/missingfunction.txt | 18 -----
 .../testdata/suggestedfix/noresultvalues.txt  |  4 --
 .../testdata/suggestedfix/self_assignment.txt |  2 -
 .../marker/testdata/suggestedfix/stub.txt     | 32 ---------
 .../testdata/suggestedfix/undeclared.txt      |  6 --
 .../testdata/suggestedfix/unusedrequire.txt   |  2 -
 .../suggestedfix/unusedrequire_gowork.txt     |  4 --
 27 files changed, 7 insertions(+), 259 deletions(-)

diff --git a/gopls/internal/lsp/regtest/marker.go b/gopls/internal/lsp/regtest/marker.go
index 98eb25154c1..c8e335f4d63 100644
--- a/gopls/internal/lsp/regtest/marker.go
+++ b/gopls/internal/lsp/regtest/marker.go
@@ -1443,7 +1443,13 @@ func checkDiffs(mark marker, changed map[string][]byte, golden *Golden) {
 			// Can't happen: edits are consistent.
 			log.Fatalf("internal error in diff.ToUnified: %v", err)
 		}
-		diffs[name] = d
+		// Trim the unified header from diffs, as it is unnecessary and repetitive.
+		difflines := strings.Split(d, "\n")
+		if len(difflines) >= 2 && strings.HasPrefix(difflines[1], "+++") {
+			diffs[name] = strings.Join(difflines[2:], "\n")
+		} else {
+			diffs[name] = d
+		}
 	}
 	// Check changed files match expectations.
 	for filename, got := range diffs {
diff --git a/gopls/internal/regtest/marker/testdata/codeaction/extract_method.txt b/gopls/internal/regtest/marker/testdata/codeaction/extract_method.txt
index e2d99c197a4..943a3ac672c 100644
--- a/gopls/internal/regtest/marker/testdata/codeaction/extract_method.txt
+++ b/gopls/internal/regtest/marker/testdata/codeaction/extract_method.txt
@@ -43,8 +43,6 @@ func (a A) Add() int {
 }
 
 -- @func1/basic.go --
---- before
-+++ after
 @@ -22 +22 @@
 -	return a.x < a.y //@loc(A_XLessThanYP, re`return.*a\.y`)
 +	return newFunction(a) //@loc(A_XLessThanYP, re`return.*a\.y`)
@@ -54,8 +52,6 @@ func (a A) Add() int {
 +}
 +
 -- @func2/basic.go --
---- before
-+++ after
 @@ -26 +26 @@
 -	sum := a.x + a.y //@loc(A_AddP1, re`sum.*a\.y`)
 +	sum := newFunction(a) //@loc(A_AddP1, re`sum.*a\.y`)
@@ -66,8 +62,6 @@ func (a A) Add() int {
 +}
 +
 -- @func3/basic.go --
---- before
-+++ after
 @@ -27 +27 @@
 -	return sum       //@loc(A_AddP2, re`return.*sum`)
 +	return newFunction(sum)       //@loc(A_AddP2, re`return.*sum`)
@@ -77,8 +71,6 @@ func (a A) Add() int {
 +}
 +
 -- @func4/basic.go --
---- before
-+++ after
 @@ -31 +31 @@
 -	return a.x < a.y //@loc(A_XLessThanY, re`return.*a\.y`)
 +	return newFunction(a) //@loc(A_XLessThanY, re`return.*a\.y`)
@@ -88,8 +80,6 @@ func (a A) Add() int {
 +}
 +
 -- @func5/basic.go --
---- before
-+++ after
 @@ -35 +35 @@
 -	sum := a.x + a.y //@loc(A_Add1, re`sum.*a\.y`)
 +	sum := newFunction(a) //@loc(A_Add1, re`sum.*a\.y`)
@@ -100,8 +90,6 @@ func (a A) Add() int {
 +}
 +
 -- @func6/basic.go --
---- before
-+++ after
 @@ -36 +36 @@
 -	return sum       //@loc(A_Add2, re`return.*sum`)
 +	return newFunction(sum)       //@loc(A_Add2, re`return.*sum`)
@@ -111,8 +99,6 @@ func (a A) Add() int {
 +}
 +
 -- @meth1/basic.go --
---- before
-+++ after
 @@ -22 +22 @@
 -	return a.x < a.y //@loc(A_XLessThanYP, re`return.*a\.y`)
 +	return a.newMethod() //@loc(A_XLessThanYP, re`return.*a\.y`)
@@ -122,8 +108,6 @@ func (a A) Add() int {
 +}
 +
 -- @meth2/basic.go --
---- before
-+++ after
 @@ -26 +26 @@
 -	sum := a.x + a.y //@loc(A_AddP1, re`sum.*a\.y`)
 +	sum := a.newMethod() //@loc(A_AddP1, re`sum.*a\.y`)
@@ -134,8 +118,6 @@ func (a A) Add() int {
 +}
 +
 -- @meth3/basic.go --
---- before
-+++ after
 @@ -27 +27 @@
 -	return sum       //@loc(A_AddP2, re`return.*sum`)
 +	return a.newMethod(sum)       //@loc(A_AddP2, re`return.*sum`)
@@ -145,8 +127,6 @@ func (a A) Add() int {
 +}
 +
 -- @meth4/basic.go --
---- before
-+++ after
 @@ -31 +31 @@
 -	return a.x < a.y //@loc(A_XLessThanY, re`return.*a\.y`)
 +	return a.newMethod() //@loc(A_XLessThanY, re`return.*a\.y`)
@@ -156,8 +136,6 @@ func (a A) Add() int {
 +}
 +
 -- @meth5/basic.go --
---- before
-+++ after
 @@ -35 +35 @@
 -	sum := a.x + a.y //@loc(A_Add1, re`sum.*a\.y`)
 +	sum := a.newMethod() //@loc(A_Add1, re`sum.*a\.y`)
@@ -168,8 +146,6 @@ func (a A) Add() int {
 +}
 +
 -- @meth6/basic.go --
---- before
-+++ after
 @@ -36 +36 @@
 -	return sum       //@loc(A_Add2, re`return.*sum`)
 +	return a.newMethod(sum)       //@loc(A_Add2, re`return.*sum`)
@@ -205,8 +181,6 @@ func (b *B) LongList(ctx context.Context) (int, error) {
 	return p1 + p2 + p3, ctx.Err() //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
 }
 -- @contextMeth1/context.go --
---- before
-+++ after
 @@ -17 +17 @@
 -	return sum, ctx.Err() //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
 +	return b.newMethod(ctx, sum) //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
@@ -216,8 +190,6 @@ func (b *B) LongList(ctx context.Context) (int, error) {
 +}
 +
 -- @contextMeth2/context.go --
---- before
-+++ after
 @@ -24 +24 @@
 -	return p1 + p2 + p3, ctx.Err() //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
 +	return b.newMethod(ctx, p1, p2, p3) //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
@@ -227,8 +199,6 @@ func (b *B) LongList(ctx context.Context) (int, error) {
 +	return p1 + p2 + p3, ctx.Err()
 +}
 -- @contextFunc2/context.go --
---- before
-+++ after
 @@ -24 +24 @@
 -	return p1 + p2 + p3, ctx.Err() //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
 +	return newFunction(ctx, p1, p2, p3) //@loc(B_LongList, re`return.*ctx\.Err\(\)`)
@@ -238,8 +208,6 @@ func (b *B) LongList(ctx context.Context) (int, error) {
 +	return p1 + p2 + p3, ctx.Err()
 +}
 -- @contextFunc1/context.go --
---- before
-+++ after
 @@ -17 +17 @@
 -	return sum, ctx.Err() //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
 +	return newFunction(ctx, sum) //@loc(B_AddP, re`return.*ctx\.Err\(\)`)
diff --git a/gopls/internal/regtest/marker/testdata/codeaction/extract_variable.txt b/gopls/internal/regtest/marker/testdata/codeaction/extract_variable.txt
index 879799fe697..c10b8185c9b 100644
--- a/gopls/internal/regtest/marker/testdata/codeaction/extract_variable.txt
+++ b/gopls/internal/regtest/marker/testdata/codeaction/extract_variable.txt
@@ -12,15 +12,11 @@ func _() {
 }
 
 -- @basic_lit1/basic_lit.go --
---- before
-+++ after
 @@ -4 +4,2 @@
 -	var _ = 1 + 2 //@codeactionedit("1", "refactor.extract", basic_lit1)
 +	x := 1
 +	var _ = x + 2 //@codeactionedit("1", "refactor.extract", basic_lit1)
 -- @basic_lit2/basic_lit.go --
---- before
-+++ after
 @@ -5 +5,2 @@
 -	var _ = 3 + 4 //@codeactionedit("3 + 4", "refactor.extract", basic_lit2)
 +	x := 3 + 4
@@ -37,15 +33,11 @@ func _() {
 }
 
 -- @func_call1/func_call.go --
---- before
-+++ after
 @@ -6 +6,2 @@
 -	x0 := append([]int{}, 1) //@codeactionedit("append([]int{}, 1)", "refactor.extract", func_call1)
 +	x := append([]int{}, 1)
 +	x0 := x //@codeactionedit("append([]int{}, 1)", "refactor.extract", func_call1)
 -- @func_call2/func_call.go --
---- before
-+++ after
 @@ -8 +8,2 @@
 -	b, err := strconv.Atoi(str) //@codeactionedit("strconv.Atoi(str)", "refactor.extract", func_call2)
 +	x, x1 := strconv.Atoi(str)
@@ -66,15 +58,11 @@ func _() {
 }
 
 -- @scope1/scope.go --
---- before
-+++ after
 @@ -8 +8,2 @@
 -		y := ast.CompositeLit{} //@codeactionedit("ast.CompositeLit{}", "refactor.extract", scope1)
 +		x := ast.CompositeLit{}
 +		y := x //@codeactionedit("ast.CompositeLit{}", "refactor.extract", scope1)
 -- @scope2/scope.go --
---- before
-+++ after
 @@ -11 +11,2 @@
 -		x1 := !false //@codeactionedit("!false", "refactor.extract", scope2)
 +		x := !false
diff --git a/gopls/internal/regtest/marker/testdata/codeaction/fill_struct.txt b/gopls/internal/regtest/marker/testdata/codeaction/fill_struct.txt
index e773ba02539..4e798a55fd6 100644
--- a/gopls/internal/regtest/marker/testdata/codeaction/fill_struct.txt
+++ b/gopls/internal/regtest/marker/testdata/codeaction/fill_struct.txt
@@ -45,16 +45,12 @@ var _ = nestedStruct{} //@codeactionedit("}", "refactor.rewrite", a3)
 
 var _ = data.B{} //@codeactionedit("}", "refactor.rewrite", a4)
 -- @a1/a.go --
---- before
-+++ after
 @@ -11 +11,3 @@
 -var _ = basicStruct{} //@codeactionedit("}", "refactor.rewrite", a1)
 +var _ = basicStruct{
 +	foo: 0,
 +} //@codeactionedit("}", "refactor.rewrite", a1)
 -- @a2/a.go --
---- before
-+++ after
 @@ -18 +18,4 @@
 -var _ = twoArgStruct{} //@codeactionedit("}", "refactor.rewrite", a2)
 +var _ = twoArgStruct{
@@ -62,8 +58,6 @@ var _ = data.B{} //@codeactionedit("}", "refactor.rewrite", a4)
 +	bar: "",
 +} //@codeactionedit("}", "refactor.rewrite", a2)
 -- @a3/a.go --
---- before
-+++ after
 @@ -25 +25,4 @@
 -var _ = nestedStruct{} //@codeactionedit("}", "refactor.rewrite", a3)
 +var _ = nestedStruct{
@@ -71,8 +65,6 @@ var _ = data.B{} //@codeactionedit("}", "refactor.rewrite", a4)
 +	basic: basicStruct{},
 +} //@codeactionedit("}", "refactor.rewrite", a3)
 -- @a4/a.go --
---- before
-+++ after
 @@ -27 +27,3 @@
 -var _ = data.B{} //@codeactionedit("}", "refactor.rewrite", a4)
 +var _ = data.B{
@@ -110,8 +102,6 @@ type funStructEmpty struct {
 var _ = funStructEmpty{} //@codeactionedit("}", "refactor.rewrite", a24)
 
 -- @a21/a2.go --
---- before
-+++ after
 @@ -11 +11,7 @@
 -var _ = typedStruct{} //@codeactionedit("}", "refactor.rewrite", a21)
 +var _ = typedStruct{
@@ -122,8 +112,6 @@ var _ = funStructEmpty{} //@codeactionedit("}", "refactor.rewrite", a24)
 +	a:  [2]string{},
 +} //@codeactionedit("}", "refactor.rewrite", a21)
 -- @a22/a2.go --
---- before
-+++ after
 @@ -17 +17,4 @@
 -var _ = funStruct{} //@codeactionedit("}", "refactor.rewrite", a22)
 +var _ = funStruct{
@@ -131,8 +119,6 @@ var _ = funStructEmpty{} //@codeactionedit("}", "refactor.rewrite", a24)
 +	},
 +} //@codeactionedit("}", "refactor.rewrite", a22)
 -- @a23/a2.go --
---- before
-+++ after
 @@ -23 +23,4 @@
 -var _ = funStructCompex{} //@codeactionedit("}", "refactor.rewrite", a23)
 +var _ = funStructCompex{
@@ -140,8 +126,6 @@ var _ = funStructEmpty{} //@codeactionedit("}", "refactor.rewrite", a24)
 +	},
 +} //@codeactionedit("}", "refactor.rewrite", a23)
 -- @a24/a2.go --
---- before
-+++ after
 @@ -29 +29,4 @@
 -var _ = funStructEmpty{} //@codeactionedit("}", "refactor.rewrite", a24)
 +var _ = funStructEmpty{
@@ -192,8 +176,6 @@ var _ = []ast.BasicLit{
 
 var _ = []ast.BasicLit{{}} //@codeactionedit("}", "refactor.rewrite", a35)
 -- @a31/a3.go --
---- before
-+++ after
 @@ -17 +17,4 @@
 -var _ = Bar{} //@codeactionedit("}", "refactor.rewrite", a31)
 +var _ = Bar{
@@ -201,8 +183,6 @@ var _ = []ast.BasicLit{{}} //@codeactionedit("}", "refactor.rewrite", a35)
 +	Y: &Foo{},
 +} //@codeactionedit("}", "refactor.rewrite", a31)
 -- @a32/a3.go --
---- before
-+++ after
 @@ -28 +28,9 @@
 -var _ = importedStruct{} //@codeactionedit("}", "refactor.rewrite", a32)
 +var _ = importedStruct{
@@ -215,8 +195,6 @@ var _ = []ast.BasicLit{{}} //@codeactionedit("}", "refactor.rewrite", a35)
 +	st: ast.CompositeLit{},
 +} //@codeactionedit("}", "refactor.rewrite", a32)
 -- @a33/a3.go --
---- before
-+++ after
 @@ -36 +36,5 @@
 -var _ = pointerBuiltinStruct{} //@codeactionedit("}", "refactor.rewrite", a33)
 +var _ = pointerBuiltinStruct{
@@ -225,8 +203,6 @@ var _ = []ast.BasicLit{{}} //@codeactionedit("}", "refactor.rewrite", a35)
 +	i: new(int),
 +} //@codeactionedit("}", "refactor.rewrite", a33)
 -- @a34/a3.go --
---- before
-+++ after
 @@ -39 +39,5 @@
 -	{}, //@codeactionedit("}", "refactor.rewrite", a34)
 +	{
@@ -235,8 +211,6 @@ var _ = []ast.BasicLit{{}} //@codeactionedit("}", "refactor.rewrite", a35)
 +		Value:    "",
 +	}, //@codeactionedit("}", "refactor.rewrite", a34)
 -- @a35/a3.go --
---- before
-+++ after
 @@ -42 +42,5 @@
 -var _ = []ast.BasicLit{{}} //@codeactionedit("}", "refactor.rewrite", a35)
 +var _ = []ast.BasicLit{{
@@ -286,24 +260,18 @@ func fill() {
 }
 
 -- @a41/a4.go --
---- before
-+++ after
 @@ -25 +25,3 @@
 -	var _ = iStruct{} //@codeactionedit("}", "refactor.rewrite", a41)
 +	var _ = iStruct{
 +		X: x,
 +	} //@codeactionedit("}", "refactor.rewrite", a41)
 -- @a42/a4.go --
---- before
-+++ after
 @@ -28 +28,3 @@
 -	var _ = sStruct{} //@codeactionedit("}", "refactor.rewrite", a42)
 +	var _ = sStruct{
 +		str: s,
 +	} //@codeactionedit("}", "refactor.rewrite", a42)
 -- @a43/a4.go --
---- before
-+++ after
 @@ -35 +35,5 @@
 -	var _ = multiFill{} //@codeactionedit("}", "refactor.rewrite", a43)
 +	var _ = multiFill{
@@ -312,8 +280,6 @@ func fill() {
 +		arr:   []int{},
 +	} //@codeactionedit("}", "refactor.rewrite", a43)
 -- @a45/a4.go --
---- before
-+++ after
 @@ -38 +38,3 @@
 -	var _ = assignStruct{} //@codeactionedit("}", "refactor.rewrite", a45)
 +	var _ = assignStruct{
@@ -348,8 +314,6 @@ func fill() {
 }
 
 -- @fill_struct1/fill_struct.go --
---- before
-+++ after
 @@ -20 +20,7 @@
 -	a := StructA{}  //@codeactionedit("}", "refactor.rewrite", fill_struct1)
 +	a := StructA{
@@ -360,24 +324,18 @@ func fill() {
 +		StructB:            StructB{},
 +	}  //@codeactionedit("}", "refactor.rewrite", fill_struct1)
 -- @fill_struct2/fill_struct.go --
---- before
-+++ after
 @@ -21 +21,3 @@
 -	b := StructA2{} //@codeactionedit("}", "refactor.rewrite", fill_struct2)
 +	b := StructA2{
 +		B: &StructB{},
 +	} //@codeactionedit("}", "refactor.rewrite", fill_struct2)
 -- @fill_struct3/fill_struct.go --
---- before
-+++ after
 @@ -22 +22,3 @@
 -	c := StructA3{} //@codeactionedit("}", "refactor.rewrite", fill_struct3)
 +	c := StructA3{
 +		B: StructB{},
 +	} //@codeactionedit("}", "refactor.rewrite", fill_struct3)
 -- @fill_struct4/fill_struct.go --
---- before
-+++ after
 @@ -24 +24,3 @@
 -		_ = StructA3{} //@codeactionedit("}", "refactor.rewrite", fill_struct4)
 +		_ = StructA3{
@@ -399,8 +357,6 @@ func fill() {
 	_ := StructAnon{} //@codeactionedit("}", "refactor.rewrite", fill_struct_anon)
 }
 -- @fill_struct_anon/fill_struct_anon.go --
---- before
-+++ after
 @@ -13 +13,5 @@
 -	_ := StructAnon{} //@codeactionedit("}", "refactor.rewrite", fill_struct_anon)
 +	_ := StructAnon{
@@ -426,8 +382,6 @@ func nested() {
 }
 
 -- @fill_nested/fill_struct_nested.go --
---- before
-+++ after
 @@ -13 +13,3 @@
 -		StructC: StructC{}, //@codeactionedit("}", "refactor.rewrite", fill_nested)
 +		StructC: StructC{
@@ -447,16 +401,12 @@ func unexported() {
 	_ = h2.Client{} //@codeactionedit("}", "refactor.rewrite", fill_struct_package2)
 }
 -- @fill_struct_package1/fill_struct_package.go --
---- before
-+++ after
 @@ -10 +10,3 @@
 -	a := data.B{}   //@codeactionedit("}", "refactor.rewrite", fill_struct_package1)
 +	a := data.B{
 +		ExportedInt: 0,
 +	}   //@codeactionedit("}", "refactor.rewrite", fill_struct_package1)
 -- @fill_struct_package2/fill_struct_package.go --
---- before
-+++ after
 @@ -11 +11,7 @@
 -	_ = h2.Client{} //@codeactionedit("}", "refactor.rewrite", fill_struct_package2)
 +	_ = h2.Client{
@@ -493,16 +443,12 @@ func fill() {
 }
 
 -- @fill_struct_partial1/fill_struct_partial.go --
---- before
-+++ after
 @@ -16 +16,3 @@
 -		PrefilledInt: 5,
 +		PrefilledInt:   5,
 +		UnfilledInt:    0,
 +		StructPartialB: StructPartialB{},
 -- @fill_struct_partial2/fill_struct_partial.go --
---- before
-+++ after
 @@ -19,4 +19,2 @@
 -		/* this comment should disappear */
 -		PrefilledInt: 7, // This comment should be blown away.
@@ -522,8 +468,6 @@ func spaces() {
 }
 
 -- @fill_struct_spaces/fill_struct_spaces.go --
---- before
-+++ after
 @@ -8 +8,3 @@
 -	d := StructD{} //@codeactionedit("}", "refactor.rewrite", fill_struct_spaces)
 +	d := StructD{
@@ -544,8 +488,6 @@ func fill() {
 }
 
 -- @fill_struct_unsafe/fill_struct_unsafe.go --
---- before
-+++ after
 @@ -11 +11,4 @@
 -	_ := unsafeStruct{} //@codeactionedit("}", "refactor.rewrite", fill_struct_unsafe)
 +	_ := unsafeStruct{
@@ -588,16 +530,12 @@ func _[T any]() {
 	_ = S{} //@codeactionedit("}", "refactor.rewrite", typeparams5)
 }
 -- @typeparams1/typeparams.go --
---- before
-+++ after
 @@ -11 +11,3 @@
 -var _ = basicStructWithTypeParams[int]{} //@codeactionedit("}", "refactor.rewrite", typeparams1)
 +var _ = basicStructWithTypeParams[int]{
 +	foo: 0,
 +} //@codeactionedit("}", "refactor.rewrite", typeparams1)
 -- @typeparams2/typeparams.go --
---- before
-+++ after
 @@ -18 +18,4 @@
 -var _ = twoArgStructWithTypeParams[string, int]{} //@codeactionedit("}", "refactor.rewrite", typeparams2)
 +var _ = twoArgStructWithTypeParams[string, int]{
@@ -605,13 +543,9 @@ func _[T any]() {
 +	bar: 0,
 +} //@codeactionedit("}", "refactor.rewrite", typeparams2)
 -- @typeparams3/typeparams.go --
---- before
-+++ after
 @@ -21 +21 @@
 +	foo: 0,
 -- @typeparams4/typeparams.go --
---- before
-+++ after
 @@ -29 +29,4 @@
 -var _ = nestedStructWithTypeParams{} //@codeactionedit("}", "refactor.rewrite", typeparams4)
 +var _ = nestedStructWithTypeParams{
@@ -619,8 +553,6 @@ func _[T any]() {
 +	basic: basicStructWithTypeParams{},
 +} //@codeactionedit("}", "refactor.rewrite", typeparams4)
 -- @typeparams5/typeparams.go --
---- before
-+++ after
 @@ -33 +33,3 @@
 -	_ = S{} //@codeactionedit("}", "refactor.rewrite", typeparams5)
 +	_ = S{
diff --git a/gopls/internal/regtest/marker/testdata/codeaction/invertif.txt b/gopls/internal/regtest/marker/testdata/codeaction/invertif.txt
index 1b5cdd2a7ef..57e77530844 100644
--- a/gopls/internal/regtest/marker/testdata/codeaction/invertif.txt
+++ b/gopls/internal/regtest/marker/testdata/codeaction/invertif.txt
@@ -115,8 +115,6 @@ func SemicolonOr() {
 }
 
 -- @boolean/p.go --
---- before
-+++ after
 @@ -10,3 +10 @@
 -	if b { //@codeactionedit("if b", "refactor.rewrite", boolean)
 -		fmt.Println("A")
@@ -126,8 +124,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("if b", "refactor.rewrite", boolean)
 +		fmt.Println("A")
 -- @boolean_fn/p.go --
---- before
-+++ after
 @@ -18,3 +18 @@
 -	if os.IsPathSeparator('X') { //@codeactionedit("if os.IsPathSeparator('X')", "refactor.rewrite", boolean_fn)
 -		fmt.Println("A")
@@ -137,8 +133,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("if os.IsPathSeparator('X')", "refactor.rewrite", boolean_fn)
 +		fmt.Println("A")
 -- @dont_remove_parens/p.go --
---- before
-+++ after
 @@ -29,4 +29,2 @@
 -	if !(a ||
 -		b) { //@codeactionedit("b", "refactor.rewrite", dont_remove_parens)
@@ -150,8 +144,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("b", "refactor.rewrite", dont_remove_parens)
 +		fmt.Println("A")
 -- @else_if/p.go --
---- before
-+++ after
 @@ -46,3 +46 @@
 -	} else if os.Args[0] == "X" { //@codeactionedit(re"if os.Args.0. == .X.", "refactor.rewrite", else_if)
 -		fmt.Println("B")
@@ -161,8 +153,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit(re"if os.Args.0. == .X.", "refactor.rewrite", else_if)
 +		fmt.Println("B")
 -- @greater_than/p.go --
---- before
-+++ after
 @@ -54,3 +54 @@
 -	if len(os.Args) > 2 { //@codeactionedit("i", "refactor.rewrite", greater_than)
 -		fmt.Println("A")
@@ -172,8 +162,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("i", "refactor.rewrite", greater_than)
 +		fmt.Println("A")
 -- @not_boolean/p.go --
---- before
-+++ after
 @@ -63,3 +63 @@
 -	if !b { //@codeactionedit("if !b", "refactor.rewrite", not_boolean)
 -		fmt.Println("A")
@@ -183,8 +171,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("if !b", "refactor.rewrite", not_boolean)
 +		fmt.Println("A")
 -- @remove_else/p.go --
---- before
-+++ after
 @@ -71,3 +71 @@
 -	if true { //@codeactionedit("if true", "refactor.rewrite", remove_else)
 -		fmt.Println("A")
@@ -195,8 +181,6 @@ func SemicolonOr() {
 +	fmt.Println("A")
 +
 -- @remove_parens/p.go --
---- before
-+++ after
 @@ -83,3 +83 @@
 -	if !(b) { //@codeactionedit("if", "refactor.rewrite", remove_parens)
 -		fmt.Println("A")
@@ -206,8 +190,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("if", "refactor.rewrite", remove_parens)
 +		fmt.Println("A")
 -- @semicolon/p.go --
---- before
-+++ after
 @@ -91,3 +91 @@
 -	if _, err := fmt.Println("x"); err != nil { //@codeactionedit("if", "refactor.rewrite", semicolon)
 -		fmt.Println("A")
@@ -217,8 +199,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("if", "refactor.rewrite", semicolon)
 +		fmt.Println("A")
 -- @semicolon_and/p.go --
---- before
-+++ after
 @@ -99,3 +99 @@
 -	if n, err := fmt.Println("x"); err != nil && n > 0 { //@codeactionedit("f", "refactor.rewrite", semicolon_and)
 -		fmt.Println("A")
@@ -228,8 +208,6 @@ func SemicolonOr() {
 +	} else { //@codeactionedit("f", "refactor.rewrite", semicolon_and)
 +		fmt.Println("A")
 -- @semicolon_or/p.go --
---- before
-+++ after
 @@ -107,3 +107 @@
 -	if n, err := fmt.Println("x"); err != nil || n < 5 { //@codeactionedit(re"if n, err := fmt.Println..x..; err != nil .. n < 5", "refactor.rewrite", semicolon_or)
 -		fmt.Println("A")
diff --git a/gopls/internal/regtest/marker/testdata/diagnostics/typeerr.txt b/gopls/internal/regtest/marker/testdata/diagnostics/typeerr.txt
index c14b9d734ba..686b05c371e 100644
--- a/gopls/internal/regtest/marker/testdata/diagnostics/typeerr.txt
+++ b/gopls/internal/regtest/marker/testdata/diagnostics/typeerr.txt
@@ -23,8 +23,6 @@ func f(x int) {
 }
 
 -- @fix/typeerr.go --
---- before
-+++ after
 @@ -6 +6 @@
 -	x := 123 //@diag(re"x := 123", re"no new variables"), suggestedfix(re"():", re"no new variables", fix)
 +	x = 123 //@diag(re"x := 123", re"no new variables"), suggestedfix(re"():", re"no new variables", fix)
diff --git a/gopls/internal/regtest/marker/testdata/rename/basic.txt b/gopls/internal/regtest/marker/testdata/rename/basic.txt
index e931affaf1a..618f9593668 100644
--- a/gopls/internal/regtest/marker/testdata/rename/basic.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/basic.txt
@@ -6,8 +6,6 @@ package p
 func f(x int) { println(x) } //@rename("x", "y", xToy)
 
 -- @xToy/basic.go --
---- before
-+++ after
 @@ -3 +3 @@
 -func f(x int) { println(x) } //@rename("x", "y", xToy)
 +func f(y int) { println(y) } //@rename("x", "y", xToy)
@@ -30,8 +28,6 @@ func _(x []int) { //@renameerr("_", "blank", `can't rename "_"`)
 }
 
 -- @AToB/alias.go --
---- before
-+++ after
 @@ -5,2 +5,2 @@
 -type A = LongNameHere //@rename("A", "B", AToB)
 -func Foo() A
diff --git a/gopls/internal/regtest/marker/testdata/rename/embed.txt b/gopls/internal/regtest/marker/testdata/rename/embed.txt
index d9f3def5507..8e6009e42ca 100644
--- a/gopls/internal/regtest/marker/testdata/rename/embed.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/embed.txt
@@ -21,14 +21,10 @@ var _ = new(B).A //@renameerr("A", "A4", errAnonField)
 -- @errAnonField --
 can't rename embedded fields: rename the type directly or name the field
 -- @type/a/a.go --
---- before
-+++ after
 @@ -3 +3 @@
 -type A int //@rename("A", "A2", type)
 +type A2 int //@rename("A", "A2", type)
 -- @type/b/b.go --
---- before
-+++ after
 @@ -5 +5 @@
 -type B struct { a.A } //@renameerr("A", "A3", errAnonField)
 +type B struct { a.A2 } //@renameerr("A", "A3", errAnonField)
diff --git a/gopls/internal/regtest/marker/testdata/rename/generics.txt b/gopls/internal/regtest/marker/testdata/rename/generics.txt
index 014925a047a..5c6143b2184 100644
--- a/gopls/internal/regtest/marker/testdata/rename/generics.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/generics.txt
@@ -28,8 +28,6 @@ func _[P ~[]int]() {
 }
 
 -- @mToM/a.go --
---- before
-+++ after
 @@ -5 +5 @@
 -func (I) m() {} //@rename("m", "M", mToM)
 +func (I) M() {} //@rename("m", "M", mToM)
@@ -46,8 +44,6 @@ func F[R any](r R) {
 }
 
 -- @PToQ/g.go --
---- before
-+++ after
 @@ -3,3 +3,3 @@
 -type S[P any] struct { //@rename("P", "Q", PToQ)
 -	P P
@@ -56,8 +52,6 @@ func F[R any](r R) {
 +	P Q
 +	F func(Q) Q
 -- @RToS/g.go --
---- before
-+++ after
 @@ -8,2 +8,2 @@
 -func F[R any](r R) {
 -	var _ R //@rename("R", "S", RToS)
@@ -88,8 +82,6 @@ import "example.com/issue61635" // importing is necessary to repro golang/go#616
 var _ issue61635.ElemData[string]
 
 -- @SToT/issue61635/p.go --
---- before
-+++ after
 @@ -3 +3 @@
 -type builder[S ~[]F, F ~string] struct { //@rename("S", "T", SToT)
 +type builder[T ~[]F, F ~string] struct { //@rename("S", "T", SToT)
@@ -114,8 +106,6 @@ func _() {
 }
 
 -- @RTos/instances/type.go --
---- before
-+++ after
 @@ -3,2 +3,2 @@
 -type R[P any] struct { //@rename("R", "u", Rtou)
 -	Next *R[P] //@rename("R", "s", RTos)
@@ -130,8 +120,6 @@ func _() {
 -	var x R[int] //@rename("R", "r", RTor)
 +	var x s[int] //@rename("R", "r", RTor)
 -- @Rtou/instances/type.go --
---- before
-+++ after
 @@ -3,2 +3,2 @@
 -type R[P any] struct { //@rename("R", "u", Rtou)
 -	Next *R[P] //@rename("R", "s", RTos)
@@ -146,8 +134,6 @@ func _() {
 -	var x R[int] //@rename("R", "r", RTor)
 +	var x u[int] //@rename("R", "r", RTor)
 -- @DoToDo1/instances/type.go --
---- before
-+++ after
 @@ -7 +7 @@
 -func (rv R[P]) Do(R[P]) R[P] { //@rename("Do", "Do1", DoToDo1)
 +func (rv R[P]) Do1(R[P]) R[P] { //@rename("Do", "Do1", DoToDo1)
@@ -158,8 +144,6 @@ func _() {
 -	x = x.Do(x)
 +	x = x.Do1(x)
 -- @DoToDo2/instances/type.go --
---- before
-+++ after
 @@ -7 +7 @@
 -func (rv R[P]) Do(R[P]) R[P] { //@rename("Do", "Do1", DoToDo1)
 +func (rv R[P]) Do2(R[P]) R[P] { //@rename("Do", "Do1", DoToDo1)
@@ -177,24 +161,18 @@ func Foo[P any](p P) { //@rename("Foo", "Bar", FooToBar)
 }
 
 -- @FooToBar/instances/func.go --
---- before
-+++ after
 @@ -3,2 +3,2 @@
 -func Foo[P any](p P) { //@rename("Foo", "Bar", FooToBar)
 -	Foo(p) //@rename("Foo", "Baz", FooToBaz)
 +func Bar[P any](p P) { //@rename("Foo", "Bar", FooToBar)
 +	Bar(p) //@rename("Foo", "Baz", FooToBaz)
 -- @FooToBaz/instances/func.go --
---- before
-+++ after
 @@ -3,2 +3,2 @@
 -func Foo[P any](p P) { //@rename("Foo", "Bar", FooToBar)
 -	Foo(p) //@rename("Foo", "Baz", FooToBaz)
 +func Baz[P any](p P) { //@rename("Foo", "Bar", FooToBar)
 +	Baz(p) //@rename("Foo", "Baz", FooToBaz)
 -- @RTor/instances/type.go --
---- before
-+++ after
 @@ -3,2 +3,2 @@
 -type R[P any] struct { //@rename("R", "u", Rtou)
 -	Next *R[P] //@rename("R", "s", RTos)
diff --git a/gopls/internal/regtest/marker/testdata/rename/issue43616.txt b/gopls/internal/regtest/marker/testdata/rename/issue43616.txt
index 9f0ca16a23b..19cfac4a435 100644
--- a/gopls/internal/regtest/marker/testdata/rename/issue43616.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/issue43616.txt
@@ -10,8 +10,6 @@ var x struct{ foo } //@renameerr("foo", "baz", "rename the type directly")
 
 var _ = x.foo //@renameerr("foo", "quux", "rename the type directly")
 -- @fooToBar/p.go --
---- before
-+++ after
 @@ -3 +3 @@
 -type foo int //@rename("foo", "bar", fooToBar),preparerename("oo","foo","foo")
 +type bar int //@rename("foo", "bar", fooToBar),preparerename("oo","foo","foo")
diff --git a/gopls/internal/regtest/marker/testdata/rename/issue60789.txt b/gopls/internal/regtest/marker/testdata/rename/issue60789.txt
index 05b3c19b4f3..d5a0b9bb5ae 100644
--- a/gopls/internal/regtest/marker/testdata/rename/issue60789.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/issue60789.txt
@@ -27,8 +27,6 @@ package b
 import _ "example.com/a"
 
 -- @fToG/a/a.go --
---- before
-+++ after
 @@ -4 +4 @@
 -func (unexported) F() {} //@rename("F", "G", fToG)
 +func (unexported) G() {} //@rename("F", "G", fToG)
diff --git a/gopls/internal/regtest/marker/testdata/rename/issue61294.txt b/gopls/internal/regtest/marker/testdata/rename/issue61294.txt
index 52bd51a098e..f376cf1d29a 100644
--- a/gopls/internal/regtest/marker/testdata/rename/issue61294.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/issue61294.txt
@@ -21,8 +21,6 @@ package b
 import _ "example.com/a"
 
 -- @OneToThree/a/a.go --
---- before
-+++ after
 @@ -5 +5 @@
 -func Two(One int) //@rename("One", "Three", OneToThree)
 +func Two(Three int) //@rename("One", "Three", OneToThree)
diff --git a/gopls/internal/regtest/marker/testdata/rename/issue61640.txt b/gopls/internal/regtest/marker/testdata/rename/issue61640.txt
index 158dba2d2d7..25723bec2a5 100644
--- a/gopls/internal/regtest/marker/testdata/rename/issue61640.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/issue61640.txt
@@ -25,8 +25,6 @@ func NewBuilderImpl[S ~[]int](name string)  *BuilderImpl[S] {
   return impl
 }
 -- @OneToTwo/a.go --
---- before
-+++ after
 @@ -6 +6 @@
 -	elements S //@rename("elements", "elements2", OneToTwo)
 +	elements2 S //@rename("elements", "elements2", OneToTwo)
diff --git a/gopls/internal/regtest/marker/testdata/rename/issue61813.txt b/gopls/internal/regtest/marker/testdata/rename/issue61813.txt
index 5fc35491f44..9d3779bb427 100644
--- a/gopls/internal/regtest/marker/testdata/rename/issue61813.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/issue61813.txt
@@ -9,8 +9,6 @@ func (P) M() {} //@rename("M", "N", MToN)
 
 var x = []*P{{}}
 -- @MToN/p.go --
---- before
-+++ after
 @@ -5 +5 @@
 -func (P) M() {} //@rename("M", "N", MToN)
 +func (P) N() {} //@rename("M", "N", MToN)
diff --git a/gopls/internal/regtest/marker/testdata/rename/methods.txt b/gopls/internal/regtest/marker/testdata/rename/methods.txt
index 0a6df5da960..5f5c5688479 100644
--- a/gopls/internal/regtest/marker/testdata/rename/methods.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/methods.txt
@@ -44,14 +44,10 @@ a/a.go:5:10: renaming this method "F" to "G"
 b/b.go:6:6:	would make example.com/a.A no longer assignable to interface B
 b/b.go:6:20:	(rename example.com/b.B.F if you intend to change both types)
 -- @BfToG/b/b.go --
---- before
-+++ after
 @@ -6 +6 @@
 -type B interface { F() } //@rename("F", "G", BfToG)
 +type B interface { G() } //@rename("F", "G", BfToG)
 -- @BfToG/d/d.go --
---- before
-+++ after
 @@ -5 +5 @@
 -var _ = b.B.F
 +var _ = b.B.G
diff --git a/gopls/internal/regtest/marker/testdata/rename/typeswitch.txt b/gopls/internal/regtest/marker/testdata/rename/typeswitch.txt
index 6e733ffc339..ec550021745 100644
--- a/gopls/internal/regtest/marker/testdata/rename/typeswitch.txt
+++ b/gopls/internal/regtest/marker/testdata/rename/typeswitch.txt
@@ -13,8 +13,6 @@ func _(x interface{}) {
 }
 
 -- @yToZ/p.go --
---- before
-+++ after
 @@ -4 +4 @@
 -	switch y := x.(type) { //@rename("y", "z", yToZ)
 +	switch z := x.(type) { //@rename("y", "z", yToZ)
diff --git a/gopls/internal/regtest/marker/testdata/stubmethods/basic.txt b/gopls/internal/regtest/marker/testdata/stubmethods/basic.txt
index b8f5e335217..5f87d13f5c7 100644
--- a/gopls/internal/regtest/marker/testdata/stubmethods/basic.txt
+++ b/gopls/internal/regtest/marker/testdata/stubmethods/basic.txt
@@ -11,8 +11,6 @@ type C int
 
 var _ error = C(0) //@suggestedfix(re"C.0.", re"missing method Error", stub)
 -- @stub/a/a.go --
---- before
-+++ after
 @@ -5 +5,5 @@
 +// Error implements error.
 +func (C) Error() string {
diff --git a/gopls/internal/regtest/marker/testdata/stubmethods/issue61693.txt b/gopls/internal/regtest/marker/testdata/stubmethods/issue61693.txt
index d03e3af499d..40596da469b 100644
--- a/gopls/internal/regtest/marker/testdata/stubmethods/issue61693.txt
+++ b/gopls/internal/regtest/marker/testdata/stubmethods/issue61693.txt
@@ -18,8 +18,6 @@ func _() {
 	F(x, C(0)) //@suggestedfix(re"C.0.", re"missing method Error", stub)
 }
 -- @stub/main.go --
---- before
-+++ after
 @@ -5 +5,5 @@
 +// Error implements error.
 +func (C) Error() string {
diff --git a/gopls/internal/regtest/marker/testdata/stubmethods/issue61830.txt b/gopls/internal/regtest/marker/testdata/stubmethods/issue61830.txt
index e5b692f0f4a..0f23ffb39ee 100644
--- a/gopls/internal/regtest/marker/testdata/stubmethods/issue61830.txt
+++ b/gopls/internal/regtest/marker/testdata/stubmethods/issue61830.txt
@@ -16,8 +16,6 @@ type A struct{}
 
 var _ I = &A{} //@suggestedfix(re"&A..", re"missing method M", stub)
 -- @stub/p.go --
---- before
-+++ after
 @@ -13 +13,5 @@
 +// M implements I.
 +func (*A) M(io.Reader, B) {
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/embeddirective.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/embeddirective.txt
index 1c0e1a91f3f..821eb10ef20 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/embeddirective.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/embeddirective.txt
@@ -18,7 +18,5 @@ func unused() {
 	_ = io.EOF
 }
 -- @fix_import/fix_import.go --
---- before
-+++ after
 @@ -4 +4 @@
 +	_ "embed"
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/missingfunction.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/missingfunction.txt
index 33f8a05db3c..d4998d14899 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/missingfunction.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/missingfunction.txt
@@ -16,8 +16,6 @@ func c() (<-chan string, chan string) {
 	return make(<-chan string), make(chan string)
 }
 -- @channels/channels.go --
---- before
-+++ after
 @@ -7 +7,4 @@
 +func undefinedChannels(ch1 <-chan string, ch2 chan string) {
 +	panic("unimplemented")
@@ -31,8 +29,6 @@ func consecutiveParams() {
 	undefinedConsecutiveParams(s, s) //@suggestedfix("undefinedConsecutiveParams", re"(undeclared|undefined)", consecutive)
 }
 -- @consecutive/consecutive.go --
---- before
-+++ after
 @@ -7 +7,4 @@
 +
 +func undefinedConsecutiveParams(s1, s2 string) {
@@ -46,8 +42,6 @@ func errorParam() {
 	undefinedErrorParam(err) //@suggestedfix("undefinedErrorParam", re"(undeclared|undefined)", error)
 }
 -- @error/error.go --
---- before
-+++ after
 @@ -7 +7,4 @@
 +
 +func undefinedErrorParam(err error) {
@@ -62,8 +56,6 @@ func literals() {
 	undefinedLiterals("hey compiler", T{}, &T{}) //@suggestedfix("undefinedLiterals", re"(undeclared|undefined)", literals)
 }
 -- @literals/literals.go --
---- before
-+++ after
 @@ -8 +8,4 @@
 +
 +func undefinedLiterals(s string, t1 T, t2 *T) {
@@ -78,8 +70,6 @@ func operation() {
 	undefinedOperation(10 * time.Second) //@suggestedfix("undefinedOperation", re"(undeclared|undefined)", operation)
 }
 -- @operation/operation.go --
---- before
-+++ after
 @@ -8 +8,4 @@
 +
 +func undefinedOperation(duration time.Duration) {
@@ -93,8 +83,6 @@ func selector() {
 	undefinedSelector(m[1]) //@suggestedfix("undefinedSelector", re"(undeclared|undefined)", selector)
 }
 -- @selector/selector.go --
---- before
-+++ after
 @@ -7 +7,4 @@
 +
 +func undefinedSelector(b bool) {
@@ -107,8 +95,6 @@ func slice() {
 	undefinedSlice([]int{1, 2}) //@suggestedfix("undefinedSlice", re"(undeclared|undefined)", slice)
 }
 -- @slice/slice.go --
---- before
-+++ after
 @@ -6 +6,4 @@
 +
 +func undefinedSlice(i []int) {
@@ -125,8 +111,6 @@ func b() (string, error) {
 	return "", nil
 }
 -- @tuple/tuple.go --
---- before
-+++ after
 @@ -7 +7,4 @@
 +func undefinedTuple(s string, err error) {
 +	panic("unimplemented")
@@ -141,8 +125,6 @@ func uniqueArguments() {
 	undefinedUniqueArguments(s, i, s) //@suggestedfix("undefinedUniqueArguments", re"(undeclared|undefined)", unique)
 }
 -- @unique/unique_params.go --
---- before
-+++ after
 @@ -8 +8,4 @@
 +
 +func undefinedUniqueArguments(s1 string, i int, s2 string) {
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/noresultvalues.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/noresultvalues.txt
index 87f38b15994..5847cea15b7 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/noresultvalues.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/noresultvalues.txt
@@ -9,14 +9,10 @@ func x() { return nil } //@suggestedfix("nil", re"too many return", x)
 
 func y() { return nil, "hello" } //@suggestedfix("nil", re"too many return", y)
 -- @x/noresultvalues.go --
---- before
-+++ after
 @@ -3 +3 @@
 -func x() { return nil } //@suggestedfix("nil", re"too many return", x)
 +func x() { return } //@suggestedfix("nil", re"too many return", x)
 -- @y/noresultvalues.go --
---- before
-+++ after
 @@ -5 +5 @@
 -func y() { return nil, "hello" } //@suggestedfix("nil", re"too many return", y)
 +func y() { return } //@suggestedfix("nil", re"too many return", y)
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/self_assignment.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/self_assignment.txt
index 1003ef21ffa..9f3c7ca5618 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/self_assignment.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/self_assignment.txt
@@ -14,8 +14,6 @@ func goodbye() {
 }
 
 -- @fix/a.go --
---- before
-+++ after
 @@ -9 +9 @@
 -	s = s //@suggestedfix("s = s", re"self-assignment", fix)
 +	 //@suggestedfix("s = s", re"self-assignment", fix)
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/stub.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/stub.txt
index e9caff34566..514a293f602 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/stub.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/stub.txt
@@ -31,8 +31,6 @@ var _ io.ReaderFrom = &readerFrom{} //@suggestedfix("&readerFrom", re"cannot use
 
 type readerFrom struct{}
 -- @readerFrom/add_selector.go --
---- before
-+++ after
 @@ -13 +13,5 @@
 +
 +// ReadFrom implements io.ReaderFrom.
@@ -52,8 +50,6 @@ func _() {
 
 type byteWriter struct{}
 -- @assign/assign.go --
---- before
-+++ after
 @@ -12 +12,5 @@
 +
 +// WriteByte implements io.ByteWriter.
@@ -74,8 +70,6 @@ func _() {
 
 type multiByteWriter struct{}
 -- @assign_multivars/assign_multivars.go --
---- before
-+++ after
 @@ -13 +13,5 @@
 +
 +// WriteByte implements io.ByteWriter.
@@ -97,8 +91,6 @@ func check(err error) {
 
 type callExpr struct{}
 -- @call_expr/call_expr.go --
---- before
-+++ after
 @@ -14 +14,5 @@
 +
 +// Error implements error.
@@ -122,8 +114,6 @@ type embeddedInterface interface {
 	io.Reader
 }
 -- @embedded/embedded.go --
---- before
-+++ after
 @@ -12 +12,20 @@
 +// Len implements embeddedInterface.
 +func (*embeddedConcrete) Len() int {
@@ -155,8 +145,6 @@ func _() {
 
 type customErr struct{}
 -- @err/err.go --
---- before
-+++ after
 @@ -9 +9,5 @@
 +
 +// Error implements error.
@@ -176,8 +164,6 @@ func newCloser() io.Closer {
 
 type closer struct{}
 -- @function_return/function_return.go --
---- before
-+++ after
 @@ -12 +12,5 @@
 +
 +// Close implements io.Closer.
@@ -198,8 +184,6 @@ type genReader[T, Y any] struct {
 	Y Y
 }
 -- @generic_receiver/generic_receiver.go --
---- before
-+++ after
 @@ -13 +13,5 @@
 +
 +// ReadFrom implements io.ReaderFrom.
@@ -226,8 +210,6 @@ var (
 
 type ignoredResetter struct{}
 -- @ignored_imports/ignored_imports.go --
---- before
-+++ after
 @@ -19 +19,5 @@
 +
 +// Reset implements zlib.Resetter.
@@ -243,8 +225,6 @@ type C int
 
 var _ I = C(0) //@suggestedfix("C", re"does not implement", issue2606)
 -- @issue2606/issue2606.go --
---- before
-+++ after
 @@ -7 +7,5 @@
 +// Error implements I.
 +func (C) Error() string {
@@ -264,8 +244,6 @@ var one, two, three io.Reader = nil, &multiVar{}, nil //@suggestedfix("&", re"do
 
 type multiVar struct{}
 -- @multi_var/multi_var.go --
---- before
-+++ after
 @@ -12 +12,5 @@
 +
 +// Read implements io.Reader.
@@ -283,8 +261,6 @@ func getReaderFrom() io.ReaderFrom {
 
 type pointerImpl struct{}
 -- @pointer/pointer.go --
---- before
-+++ after
 @@ -10 +10,5 @@
 +
 +// ReadFrom implements io.ReaderFrom.
@@ -304,8 +280,6 @@ var _ myio.Reader
 
 type myIO struct{}
 -- @renamed_import/renamed_import.go --
---- before
-+++ after
 @@ -12 +12,5 @@
 +
 +// Reset implements zlib.Resetter.
@@ -327,8 +301,6 @@ var _ other.Interface = &otherInterfaceImpl{} //@suggestedfix("&otherInterfaceIm
 
 type otherInterfaceImpl struct{}
 -- @renamed_import_iface/renamed_import_iface.go --
---- before
-+++ after
 @@ -4 +4,2 @@
 +	"bytes"
 +	"context"
@@ -349,8 +321,6 @@ var _ io.Writer = writer{} //@suggestedfix("w", re"does not implement", stdlib)
 
 type writer struct{}
 -- @stdlib/stdlib.go --
---- before
-+++ after
 @@ -10 +10,5 @@
 +
 +// Write implements io.Writer.
@@ -382,8 +352,6 @@ func _() {
 	var _ io.ReadCloser = local{} //@diag("local", re"does not implement")
 }
 -- @typedecl_group/typedecl_group.go --
---- before
-+++ after
 @@ -18 +18,10 @@
 +// Close implements io.ReadCloser.
 +func (rdcloser) Close() error {
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/undeclared.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/undeclared.txt
index 2520acabb37..897e9b14952 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/undeclared.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/undeclared.txt
@@ -14,8 +14,6 @@ func a() {
 }
 
 -- @a/a.go --
---- before
-+++ after
 @@ -4 +4 @@
 +	y := 
 -- b.go --
@@ -28,8 +26,6 @@ func b() {
 }
 
 -- @b/b.go --
---- before
-+++ after
 @@ -4 +4 @@
 +	n := 
 -- c.go --
@@ -42,7 +38,5 @@ func c() {
 }
 
 -- @c/c.go --
---- before
-+++ after
 @@ -4 +4 @@
 +	i := 
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire.txt
index c9f6eee5c3a..8ec46e9ea68 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire.txt
@@ -16,8 +16,6 @@ go 1.14
 require example.com v1.0.0 //@suggestedfix("require", re"not used", a)
 
 -- @a/a/go.mod --
---- before
-+++ after
 @@ -4,3 +4 @@
 -
 -require example.com v1.0.0 //@suggestedfix("require", re"not used", a)
diff --git a/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire_gowork.txt b/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire_gowork.txt
index 35ed16c8d9d..278a52c7b4c 100644
--- a/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire_gowork.txt
+++ b/gopls/internal/regtest/marker/testdata/suggestedfix/unusedrequire_gowork.txt
@@ -26,8 +26,6 @@ go 1.14
 require example.com v1.0.0 //@suggestedfix("require", re"not used", a)
 
 -- @a/a/go.mod --
---- before
-+++ after
 @@ -4,3 +4 @@
 -
 -require example.com v1.0.0 //@suggestedfix("require", re"not used", a)
@@ -44,8 +42,6 @@ go 1.14
 require example.com v1.0.0 //@suggestedfix("require", re"not used", b)
 
 -- @b/b/go.mod --
---- before
-+++ after
 @@ -4,3 +4 @@
 -
 -require example.com v1.0.0 //@suggestedfix("require", re"not used", b)