x/tools: downgrade token.FileSet parameters to token.File

adonovan · adonovan · commit 1f054fd59ccb · 2025-10-08T10:56:47.000-07:00
Various functions are inherently concerned with exactly one file. By passing a token.File instead of a whole FileSet as a parameter, this is more obvious at a glance; and a callee can't modify a FileSet it doesn't have. This CL does this for a number of internal functions. (What's the downside? Formatting an ast.Node does require a FileSet, even when the tree contains nodes only from one file, as usual. However, we can construct an ephemeral singleton FileSet using AddExistingFiles should the need arise.) Change-Id: If8a38af220f105f581ffb4fd7d554f795b55847c Reviewed-on: https://go-review.googlesource.com/c/tools/+/710255 Reviewed-by: Robert Findley <rfindley@google.com> Commit-Queue: Alan Donovan <adonovan@google.com> Auto-Submit: Alan Donovan <adonovan@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/go/analysis/internal/checker/fix_test.go b/go/analysis/internal/checker/fix_test.go
@@ -431,7 +431,7 @@ var markerAnalyzer = &analysis.Analyzer{
 			if err != nil {
 				return nil, err
 			}
-			notes, err := expect.ExtractGo(pass.Fset, file)
+			notes, err := expect.ExtractGo(tokFile, file)
 			if err != nil {
 				return nil, err
 			}
diff --git a/go/analysis/passes/modernize/errorsastype.go b/go/analysis/passes/modernize/errorsastype.go
@@ -148,7 +148,7 @@ func errorsastype(pass *analysis.Pass) (any, error) {
 				Message: fmt.Sprintf("Replace errors.As with AsType[%s]", errtype),
 				TextEdits: append(
 					// delete "var myerr *MyErr"
-					analysisinternal.DeleteStmt(pass.Fset, curDeclStmt),
+					analysisinternal.DeleteStmt(pass.Fset.File(call.Fun.Pos()), curDeclStmt),
 					// if              errors.As            (err, &myerr)     { ... }
 					//    -------------       --------------    -------- ----
 					// if myerr, ok := errors.AsType[*MyErr](err        ); ok { ... }
diff --git a/go/analysis/passes/modernize/forvar.go b/go/analysis/passes/modernize/forvar.go
@@ -71,7 +71,7 @@ func forvar(pass *analysis.Pass) (any, error) {
 					isLoopVarRedecl(assign) {
 
 					curStmt, _ := curLoop.FindNode(stmt)
-					edits := analysisinternal.DeleteStmt(pass.Fset, curStmt)
+					edits := analysisinternal.DeleteStmt(pass.Fset.File(stmt.Pos()), curStmt)
 					if len(edits) > 0 {
 						pass.Report(analysis.Diagnostic{
 							Pos:     stmt.Pos(),
diff --git a/go/analysis/passes/modernize/waitgroup.go b/go/analysis/passes/modernize/waitgroup.go
@@ -130,6 +130,7 @@ func waitgroup(pass *analysis.Pass) (any, error) {
 		if !fileUses(info, file, "go1.25") {
 			continue
 		}
+		tokFile := pass.Fset.File(file.Pos())
 
 		var addCallRecvText bytes.Buffer
 		err := printer.Fprint(&addCallRecvText, pass.Fset, addCallRecv)
@@ -145,9 +146,9 @@ func waitgroup(pass *analysis.Pass) (any, error) {
 				Message: "Simplify by using WaitGroup.Go",
 				TextEdits: slices.Concat(
 					// delete "wg.Add(1)"
-					analysisinternal.DeleteStmt(pass.Fset, curAddStmt),
+					analysisinternal.DeleteStmt(tokFile, curAddStmt),
 					// delete "wg.Done()" or "defer wg.Done()"
-					analysisinternal.DeleteStmt(pass.Fset, curDoneStmt),
+					analysisinternal.DeleteStmt(tokFile, curDoneStmt),
 					[]analysis.TextEdit{
 						// go    func()
 						// ------
diff --git a/go/ssa/builder_generic_test.go b/go/ssa/builder_generic_test.go
@@ -521,9 +521,10 @@ func TestGenericBodies(t *testing.T) {
 			t.Parallel()
 			ssapkg, ppkg := buildPackage(t, content, ssa.SanityCheckFunctions)
 			fset := ssapkg.Prog.Fset
+			file := ppkg.Syntax[0]
 
 			// Collect all notes in f, i.e. comments starting with "//@ types".
-			notes, err := expect.ExtractGo(fset, ppkg.Syntax[0])
+			notes, err := expect.ExtractGo(fset.File(file.Pos()), file)
 			if err != nil {
 				t.Errorf("expect.ExtractGo: %v", err)
 			}
@@ -759,7 +760,7 @@ func TestInstructionString(t *testing.T) {
 	p.Build()
 
 	// Collect all notes in f, i.e. comments starting with "//@ instr".
-	notes, err := expect.ExtractGo(prog.Fset, f)
+	notes, err := expect.ExtractGo(prog.Fset.File(f.Pos()), f)
 	if err != nil {
 		t.Errorf("expect.ExtractGo: %v", err)
 	}
diff --git a/go/ssa/builder_test.go b/go/ssa/builder_test.go
@@ -1368,7 +1368,7 @@ func TestRangeOverInt(t *testing.T) {
 	}
 
 	// Collect all notes in f, i.e. comments starting with "//@ types".
-	notes, err := expect.ExtractGo(fset, f)
+	notes, err := expect.ExtractGo(fset.File(f.Pos()), f)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/go/ssa/source_test.go b/go/ssa/source_test.go
@@ -33,9 +33,12 @@ func TestObjValueLookup(t *testing.T) {
 	}
 	readFile := func(filename string) ([]byte, error) { return src, nil }
 
-	mode := ssa.GlobalDebug /*|ssa.PrintFunctions*/
-	mainPkg, ppkg := buildPackage(t, string(src), mode)
-	fset := ppkg.Fset
+	var (
+		mode          = ssa.GlobalDebug /*|ssa.PrintFunctions*/
+		mainPkg, ppkg = buildPackage(t, string(src), mode)
+		f             = ppkg.Syntax[0]
+		tokFile       = ppkg.Fset.File(f.Pos())
+	)
 
 	// Maps each var Ident (represented "name:linenum") to the
 	// kind of ssa.Value we expect (represented "Constant", "&Alloc").
@@ -44,35 +47,35 @@ func TestObjValueLookup(t *testing.T) {
 	// Each note of the form @ssa(x, "BinOp") in testdata/objlookup.go
 	// specifies an expectation that an object named x declared on the
 	// same line is associated with an ssa.Value of type *ssa.BinOp.
-	notes, err := expect.ExtractGo(fset, ppkg.Syntax[0])
+	notes, err := expect.ExtractGo(tokFile, f)
 	if err != nil {
 		t.Fatal(err)
 	}
 	for _, n := range notes {
 		if n.Name != "ssa" {
-			t.Errorf("%v: unexpected note type %q, want \"ssa\"", fset.Position(n.Pos), n.Name)
+			t.Errorf("%v: unexpected note type %q, want \"ssa\"", tokFile.Position(n.Pos), n.Name)
 			continue
 		}
 		if len(n.Args) != 2 {
-			t.Errorf("%v: ssa has %d args, want 2", fset.Position(n.Pos), len(n.Args))
+			t.Errorf("%v: ssa has %d args, want 2", tokFile.Position(n.Pos), len(n.Args))
 			continue
 		}
 		ident, ok := n.Args[0].(expect.Identifier)
 		if !ok {
-			t.Errorf("%v: got %v for arg 1, want identifier", fset.Position(n.Pos), n.Args[0])
+			t.Errorf("%v: got %v for arg 1, want identifier", tokFile.Position(n.Pos), n.Args[0])
 			continue
 		}
 		exp, ok := n.Args[1].(string)
 		if !ok {
-			t.Errorf("%v: got %v for arg 2, want string", fset.Position(n.Pos), n.Args[1])
+			t.Errorf("%v: got %v for arg 2, want string", tokFile.Position(n.Pos), n.Args[1])
 			continue
 		}
-		p, _, err := expect.MatchBefore(fset, readFile, n.Pos, string(ident))
+		p, _, err := expect.MatchBefore(tokFile, readFile, n.Pos, string(ident))
 		if err != nil {
 			t.Error(err)
 			continue
 		}
-		pos := fset.Position(p)
+		pos := tokFile.Position(p)
 		key := fmt.Sprintf("%s:%d", ident, pos.Line)
 		expectations[key] = exp
 	}
@@ -107,8 +110,8 @@ func TestObjValueLookup(t *testing.T) {
 	// The result varies based on the specific Ident.
 	for i, id := range varIds {
 		obj := varObjs[i]
-		ref, _ := astutil.PathEnclosingInterval(ppkg.Syntax[0], id.Pos(), id.Pos())
-		pos := fset.Position(id.Pos())
+		ref, _ := astutil.PathEnclosingInterval(f, id.Pos(), id.Pos())
+		pos := tokFile.Position(id.Pos())
 		exp := expectations[fmt.Sprintf("%s:%d", id.Name, pos.Line)]
 		if exp == "" {
 			t.Errorf("%s: no expectation for var ident %s ", pos, id.Name)
@@ -222,9 +225,12 @@ func testValueForExpr(t *testing.T, testfile string) {
 		t.Fatal(err)
 	}
 
-	mode := ssa.GlobalDebug /*|ssa.PrintFunctions*/
-	mainPkg, ppkg := buildPackage(t, string(src), mode)
-	fset, file := ppkg.Fset, ppkg.Syntax[0]
+	var (
+		mode          = ssa.GlobalDebug /*|ssa.PrintFunctions*/
+		mainPkg, ppkg = buildPackage(t, string(src), mode)
+		file          = ppkg.Syntax[0]
+		tokFile       = ppkg.Fset.File(file.Pos())
+	)
 
 	if false {
 		// debugging
@@ -245,7 +251,7 @@ func testValueForExpr(t *testing.T, testfile string) {
 		return true
 	})
 
-	notes, err := expect.ExtractGo(fset, file)
+	notes, err := expect.ExtractGo(tokFile, file)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -254,7 +260,7 @@ func testValueForExpr(t *testing.T, testfile string) {
 		if want == "nil" {
 			want = "<nil>"
 		}
-		position := fset.Position(n.Pos)
+		position := tokFile.Position(n.Pos)
 		var e ast.Expr
 		for _, paren := range parenExprs {
 			if paren.Pos() > n.Pos {
diff --git a/gopls/internal/analysis/unusedvariable/unusedvariable.go b/gopls/internal/analysis/unusedvariable/unusedvariable.go
@@ -55,7 +55,8 @@ func run(pass *analysis.Pass) (any, error) {
 				continue // not the right identifier
 			}
 
-			edits := analysisinternal.DeleteVar(pass.Fset, pass.TypesInfo, curId)
+			tokFile := pass.Fset.File(ident.Pos())
+			edits := analysisinternal.DeleteVar(tokFile, pass.TypesInfo, curId)
 			if len(edits) > 0 {
 				pass.Report(analysis.Diagnostic{
 					Pos:     ident.Pos(),
diff --git a/gopls/internal/cache/check.go b/gopls/internal/cache/check.go
@@ -2061,7 +2061,7 @@ func typeErrorsToDiagnostics(pkg *syntaxPackage, inputs *typeCheckInputs, errs [
 				//
 				// TODO(adonovan): It is the type checker's responsibility
 				// to ensure that (start, end) are meaningful; see #71803.
-				end = analysisinternal.TypeErrorEndPos(e.Fset, pgf.Src, start)
+				end = analysisinternal.TypeErrorEndPos(pgf.Tok, pgf.Src, start)
 
 				// debugging golang/go#65960
 				if _, err := safetoken.Offset(pgf.Tok, end); err != nil {
diff --git a/internal/analysisinternal/analysis.go b/internal/analysisinternal/analysis.go
@@ -29,13 +29,9 @@ import (
 
 // Deprecated: this heuristic is ill-defined.
 // TODO(adonovan): move to sole use in gopls/internal/cache.
-func TypeErrorEndPos(fset *token.FileSet, src []byte, start token.Pos) token.Pos {
+func TypeErrorEndPos(tokFile *token.File, src []byte, start token.Pos) token.Pos {
 	// Get the end position for the type error.
-	file := fset.File(start)
-	if file == nil {
-		return start
-	}
-	if offset := file.PositionFor(start, false).Offset; offset > len(src) {
+	if offset := tokFile.PositionFor(start, false).Offset; offset > len(src) {
 		return start
 	} else {
 		src = src[offset:]
@@ -61,7 +57,7 @@ func TypeErrorEndPos(fset *token.FileSet, src []byte, start token.Pos) token.Pos
 		s.Init(f, src, nil /* no error handler */, scanner.ScanComments)
 		pos, tok, lit := s.Scan()
 		if tok != token.SEMICOLON && token.Pos(f.Base()) <= pos && pos <= token.Pos(f.Base()+f.Size()) {
-			off := file.Offset(pos) + len(lit)
+			off := tokFile.Offset(pos) + len(lit)
 			src = src[off:]
 			end += token.Pos(off)
 		}
@@ -527,17 +523,14 @@ func CanImport(from, to string) bool {
 // DeleteStmt returns the edits to remove the [ast.Stmt] identified by
 // curStmt, if it is contained within a BlockStmt, CaseClause,
 // CommClause, or is the STMT in switch STMT; ... {...}. It returns nil otherwise.
-//
-// TODO(adonovan): downgrade first param to a *token.File?
-func DeleteStmt(fset *token.FileSet, curStmt inspector.Cursor) []analysis.TextEdit {
+func DeleteStmt(tokFile *token.File, curStmt inspector.Cursor) []analysis.TextEdit {
 	stmt := curStmt.Node().(ast.Stmt)
 	// if the stmt is on a line by itself delete the whole line
 	// otherwise just delete the statement.
 
 	// this logic would be a lot simpler with the file contents, and somewhat simpler
 	// if the cursors included the comments.
 
-	tokFile := fset.File(stmt.Pos())
 	lineOf := tokFile.Line
 	stmtStartLine, stmtEndLine := lineOf(stmt.Pos()), lineOf(stmt.End())
 
diff --git a/internal/analysisinternal/analysis_test.go b/internal/analysisinternal/analysis_test.go
@@ -232,7 +232,8 @@ func TestDeleteStmt(t *testing.T) {
 			if cnt != tt.which {
 				t.Fatalf("test %s does not contain desired statement %d", tt.name, tt.which)
 			}
-			edits := DeleteStmt(fset, stmt)
+			tokFile := fset.File(f.Pos())
+			edits := DeleteStmt(tokFile, stmt)
 			if tt.want == tt.in {
 				if len(edits) != 0 {
 					t.Fatalf("%s: got %d edits, expected 0", tt.name, len(edits))
@@ -242,7 +243,6 @@ func TestDeleteStmt(t *testing.T) {
 			if len(edits) != 1 {
 				t.Fatalf("%s: got %d edits, expected 1", tt.name, len(edits))
 			}
-			tokFile := fset.File(f.Pos())
 
 			left := tokFile.Offset(edits[0].Pos)
 			right := tokFile.Offset(edits[0].End)
diff --git a/internal/analysisinternal/deletevar.go b/internal/analysisinternal/deletevar.go
@@ -28,13 +28,13 @@ import (
 //
 // If it cannot make the necessary edits, such as for a function
 // parameter or result, it returns nil.
-func DeleteVar(fset *token.FileSet, info *types.Info, curId inspector.Cursor) []analysis.TextEdit {
+func DeleteVar(tokFile *token.File, info *types.Info, curId inspector.Cursor) []analysis.TextEdit {
 	switch ek, _ := curId.ParentEdge(); ek {
 	case edge.ValueSpec_Names:
-		return deleteVarFromValueSpec(fset, info, curId)
+		return deleteVarFromValueSpec(tokFile, info, curId)
 
 	case edge.AssignStmt_Lhs:
-		return deleteVarFromAssignStmt(fset, info, curId)
+		return deleteVarFromAssignStmt(tokFile, info, curId)
 	}
 
 	// e.g. function receiver, parameter, or result,
@@ -45,7 +45,7 @@ func DeleteVar(fset *token.FileSet, info *types.Info, curId inspector.Cursor) []
 // Precondition: curId is Ident beneath ValueSpec.Names beneath GenDecl.
 //
 // See also [deleteVarFromAssignStmt], which has parallel structure.
-func deleteVarFromValueSpec(fset *token.FileSet, info *types.Info, curIdent inspector.Cursor) []analysis.TextEdit {
+func deleteVarFromValueSpec(tokFile *token.File, info *types.Info, curIdent inspector.Cursor) []analysis.TextEdit {
 	var (
 		id      = curIdent.Node().(*ast.Ident)
 		curSpec = curIdent.Parent()
@@ -61,7 +61,7 @@ func deleteVarFromValueSpec(fset *token.FileSet, info *types.Info, curIdent insp
 	if !declaresOtherNames && noRHSEffects {
 		// The spec is no longer needed, either to declare
 		// other variables, or for its side effects.
-		return DeleteSpec(fset, curSpec)
+		return DeleteSpec(tokFile, curSpec)
 	}
 
 	// The spec is still needed, either for
@@ -144,7 +144,7 @@ func deleteVarFromValueSpec(fset *token.FileSet, info *types.Info, curIdent insp
 // Precondition: curId is Ident beneath AssignStmt.Lhs.
 //
 // See also [deleteVarFromValueSpec], which has parallel structure.
-func deleteVarFromAssignStmt(fset *token.FileSet, info *types.Info, curIdent inspector.Cursor) []analysis.TextEdit {
+func deleteVarFromAssignStmt(tokFile *token.File, info *types.Info, curIdent inspector.Cursor) []analysis.TextEdit {
 	var (
 		id      = curIdent.Node().(*ast.Ident)
 		curStmt = curIdent.Parent()
@@ -161,7 +161,7 @@ func deleteVarFromAssignStmt(fset *token.FileSet, info *types.Info, curIdent ins
 	if !declaresOtherNames && noRHSEffects {
 		// The assignment is no longer needed, either to
 		// declare other variables, or for its side effects.
-		if edits := DeleteStmt(fset, curStmt); edits != nil {
+		if edits := DeleteStmt(tokFile, curStmt); edits != nil {
 			return edits
 		}
 		// Statement could not not be deleted in this context.
@@ -239,7 +239,7 @@ func deleteVarFromAssignStmt(fset *token.FileSet, info *types.Info, curIdent ins
 // DeleteSpec returns edits to delete the ValueSpec identified by curSpec.
 //
 // TODO(adonovan): add test suite. Test for consts as well.
-func DeleteSpec(fset *token.FileSet, curSpec inspector.Cursor) []analysis.TextEdit {
+func DeleteSpec(tokFile *token.File, curSpec inspector.Cursor) []analysis.TextEdit {
 	var (
 		spec    = curSpec.Node().(*ast.ValueSpec)
 		curDecl = curSpec.Parent()
@@ -249,7 +249,7 @@ func DeleteSpec(fset *token.FileSet, curSpec inspector.Cursor) []analysis.TextEd
 	// If it is the sole spec in the decl,
 	// delete the entire decl.
 	if len(decl.Specs) == 1 {
-		return DeleteDecl(fset, curDecl)
+		return DeleteDecl(tokFile, curDecl)
 	}
 
 	// Delete the spec and its comments.
@@ -279,13 +279,13 @@ func DeleteSpec(fset *token.FileSet, curSpec inspector.Cursor) []analysis.TextEd
 // DeleteDecl returns edits to delete the ast.Decl identified by curDecl.
 //
 // TODO(adonovan): add test suite. Test for consts as well.
-func DeleteDecl(fset *token.FileSet, curDecl inspector.Cursor) []analysis.TextEdit {
+func DeleteDecl(tokFile *token.File, curDecl inspector.Cursor) []analysis.TextEdit {
 	decl := curDecl.Node().(ast.Decl)
 
 	ek, _ := curDecl.ParentEdge()
 	switch ek {
 	case edge.DeclStmt_Decl:
-		return DeleteStmt(fset, curDecl.Parent())
+		return DeleteStmt(tokFile, curDecl.Parent())
 
 	case edge.File_Decls:
 		pos, end := decl.Pos(), decl.End()
@@ -297,7 +297,6 @@ func DeleteDecl(fset *token.FileSet, curDecl inspector.Cursor) []analysis.TextEd
 		//    var (...) // comment
 		var (
 			file        = curDecl.Parent().Node().(*ast.File)
-			tokFile     = fset.File(file.Pos())
 			lineOf      = tokFile.Line
 			declEndLine = lineOf(decl.End())
 		)
diff --git a/internal/analysisinternal/deletevar_test.go b/internal/analysisinternal/deletevar_test.go
@@ -295,7 +295,8 @@ func TestDeleteVar(t *testing.T) {
 				t.Fatalf("can't find Defs[v]")
 				panic("unreachable")
 			}()
-			edits := analysisinternal.DeleteVar(fset, info, curId)
+			tokFile := fset.File(f.Pos())
+			edits := analysisinternal.DeleteVar(tokFile, info, curId)
 
 			// TODO(adonovan): extract this helper for
 			// applying TextEdits and comparing against
diff --git a/internal/expect/expect.go b/internal/expect/expect.go
@@ -79,15 +79,14 @@ type Note struct {
 type ReadFile func(filename string) ([]byte, error)
 
 // MatchBefore attempts to match a pattern in the line before the supplied pos.
-// It uses the FileSet and the ReadFile to work out the contents of the line
+// It uses the token.File and the ReadFile to work out the contents of the line
 // that end is part of, and then matches the pattern against the content of the
 // start of that line up to the supplied position.
 // The pattern may be either a simple string, []byte or a *regexp.Regexp.
 // MatchBefore returns the range of the line that matched the pattern, and
 // invalid positions if there was no match, or an error if the line could not be
 // found.
-func MatchBefore(fset *token.FileSet, readFile ReadFile, end token.Pos, pattern any) (token.Pos, token.Pos, error) {
-	f := fset.File(end)
+func MatchBefore(f *token.File, readFile ReadFile, end token.Pos, pattern any) (token.Pos, token.Pos, error) {
 	content, err := readFile(f.Name())
 	if err != nil {
 		return token.NoPos, token.NoPos, fmt.Errorf("invalid file: %v", err)
diff --git a/internal/expect/expect_test.go b/internal/expect/expect_test.go
@@ -156,7 +156,7 @@ func TestMarker(t *testing.T) {
 }
 
 func checkMarker(t *testing.T, fset *token.FileSet, readFile expect.ReadFile, markers map[string]token.Pos, pos token.Pos, name string, pattern any) {
-	start, end, err := expect.MatchBefore(fset, readFile, pos, pattern)
+	start, end, err := expect.MatchBefore(fset.File(pos), readFile, pos, pattern)
 	if err != nil {
 		t.Errorf("%v: MatchBefore failed: %v", fset.Position(pos), err)
 		return
diff --git a/internal/expect/extract.go b/internal/expect/extract.go
diff --git a/internal/packagestest/expect.go b/internal/packagestest/expect.go
diff --git a/internal/refactor/inline/inline_test.go b/internal/refactor/inline/inline_test.go

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ var markerAnalyzer = &analysis.Analyzer{`
`431`	`431`	`if err != nil {`
`432`	`432`	`return nil, err`
`433`	`433`	`}`
`434`		`- notes, err := expect.ExtractGo(pass.Fset, file)`
	`434`	`+ notes, err := expect.ExtractGo(tokFile, file)`
`435`	`435`	`if err != nil {`
`436`	`436`	`return nil, err`
`437`	`437`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,7 @@ func TestRangeOverInt(t *testing.T) {`
`1368`	`1368`	`}`
`1369`	`1369`
`1370`	`1370`	`// Collect all notes in f, i.e. comments starting with "//@ types".`
`1371`		`- notes, err := expect.ExtractGo(fset, f)`
	`1371`	`+ notes, err := expect.ExtractGo(fset.File(f.Pos()), f)`
`1372`	`1372`	`if err != nil {`
`1373`	`1373`	`t.Fatal(err)`
`1374`	`1374`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ func run(pass *analysis.Pass) (any, error) {`
`55`	`55`	`continue // not the right identifier`
`56`	`56`	`}`
`57`	`57`
`58`		`- edits := analysisinternal.DeleteVar(pass.Fset, pass.TypesInfo, curId)`
	`58`	`+ tokFile := pass.Fset.File(ident.Pos())`
	`59`	`+ edits := analysisinternal.DeleteVar(tokFile, pass.TypesInfo, curId)`
`59`	`60`	`if len(edits) > 0 {`
`60`	`61`	`pass.Report(analysis.Diagnostic{`
`61`	`62`	`Pos: ident.Pos(),`