fix: improve suggested fixes for map.(Keys|Values)

ldez · ldez · commit 3458523c6aa1 · 2025-06-10T16:57:07.000+02:00
diff --git a/exptostd.go b/exptostd.go
@@ -365,7 +365,7 @@ func suggestedFixForKeysOrValues(callExpr *ast.CallExpr) (analysis.SuggestedFix,
 				Fun: &ast.Ident{Name: "make"},
 				Args: []ast.Expr{
 					&ast.ArrayType{
-						Elt: &ast.Ident{Name: "T"}, // TODO(ldez) improve the type detection.
+						Elt: &ast.Ident{Name: "FIXME"}, // TODO(ldez) improve the type detection.
 					},
 					&ast.BasicLit{Kind: token.INT, Value: "0"},
 					&ast.CallExpr{
diff --git a/testdata/src/expmaps/maps.go.golden b/testdata/src/expmaps/maps.go.golden
@@ -7,9 +7,9 @@ import (
 func _(m, a map[string]string) {
 	maps.Clone(m) // want `golang.org/x/exp/maps.Clone\(\) can be replaced by maps.Clone\(\)`
 
-	slices.AppendSeq(make([]T, 0, len(m)), maps.Keys(m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
+	slices.AppendSeq(make([]FIXME, 0, len(m)), maps.Keys(m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
 
-	slices.AppendSeq(make([]T, 0, len(m)), maps.Values(m)) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)`
+	slices.AppendSeq(make([]FIXME, 0, len(m)), maps.Values(m)) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)`
 
 	maps.Equal(m, a) // want `golang.org/x/exp/maps.Equal\(\) can be replaced by maps.Equal\(\)`
 
@@ -39,11 +39,11 @@ func _() {
 		},
 	}
 
-	slices.AppendSeq(make([]T, 0, len(f.m)), maps.Keys(f.m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
+	slices.AppendSeq(make([]FIXME, 0, len(f.m)), maps.Keys(f.m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
 }
 
 func _() {
-	slices.AppendSeq(make([]T, 0, len(someFunc().m)), maps.Keys(someFunc().m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
+	slices.AppendSeq(make([]FIXME, 0, len(someFunc().m)), maps.Keys(someFunc().m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
 }
 
 func someFunc() foo {

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import (`
`7`	`7`	`func _(m, a map[string]string) {`
`8`	`8`	maps.Clone(m) // want `golang.org/x/exp/maps.Clone\(\) can be replaced by maps.Clone\(\)`
`9`	`9`
`10`		- slices.AppendSeq(make([]T, 0, len(m)), maps.Keys(m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
	`10`	+ slices.AppendSeq(make([]FIXME, 0, len(m)), maps.Keys(m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
`11`	`11`
`12`		- slices.AppendSeq(make([]T, 0, len(m)), maps.Values(m)) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)`
	`12`	+ slices.AppendSeq(make([]FIXME, 0, len(m)), maps.Values(m)) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)`
`13`	`13`
`14`	`14`	maps.Equal(m, a) // want `golang.org/x/exp/maps.Equal\(\) can be replaced by maps.Equal\(\)`
`15`	`15`
`@@ -39,11 +39,11 @@ func _() {`
`39`	`39`	`},`
`40`	`40`	`}`
`41`	`41`
`42`		- slices.AppendSeq(make([]T, 0, len(f.m)), maps.Keys(f.m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
	`42`	+ slices.AppendSeq(make([]FIXME, 0, len(f.m)), maps.Keys(f.m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func _() {`
`46`		- slices.AppendSeq(make([]T, 0, len(someFunc().m)), maps.Keys(someFunc().m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
	`46`	+ slices.AppendSeq(make([]FIXME, 0, len(someFunc().m)), maps.Keys(someFunc().m)) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func someFunc() foo {`